paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-15 02:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: carbon: less hints

Browse Source 
git-svn-id: trunk@47676 -
This commit is contained in:
mattias 2015-02-10 15:10:02 +00:00
parent 5b2a9ea16a
commit f9fbb2185d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/interfaces/carbon/carbonedits.pp
View File

@ -25,7 +25,7 @@ uses
MacOSAll, MacOSAll,
// LCL // LCL
LMessages, LCLMessageGlue, LCLProc, LCLType, Graphics, Controls, StdCtrls, ExtCtrls, LMessages, LCLMessageGlue, LCLProc, LCLType, Graphics, Controls, StdCtrls, ExtCtrls,
Spin, Spin, LazUTF8,
// widgetset // widgetset
WSLCLClasses, WSLCLClasses,
// LCL Carbon // LCL Carbon
@ -276,10 +276,10 @@ begin
if MaxLength > 0 then if MaxLength > 0 then
begin begin
if GetText(S{%H-}) then if GetText(S{%H-}) then
if UTF8Length(S) > MaxLength then if LazUTF8.UTF8Length(S) > MaxLength then
begin begin
R := GetSelStart(SelStart{%H-}); R := GetSelStart(SelStart{%H-});
S := UTF8Copy(S, 1, MaxLength); S := LazUTF8.UTF8Copy(S, 1, MaxLength);
if SetText(S) then if SetText(S) then
if R then SetSelStart(SelStart); if R then SetSelStart(SelStart);
end; end;
@ -1926,7 +1926,7 @@ begin
end end
else if lIsReadOnlyMemo and (lInputPasStr = 'AXNumberOfCharacters') then else if lIsReadOnlyMemo and (lInputPasStr = 'AXNumberOfCharacters') then
begin begin
lOutputInt := UTF8Length(lLazMemo.Lines.Text); lOutputInt := LazUTF8.UTF8Length(lLazMemo.Lines.Text);
lOutputNum := CFNumberCreate(nil, kCFNumberSInt64Type, @lOutputInt); lOutputNum := CFNumberCreate(nil, kCFNumberSInt64Type, @lOutputInt);
SetEventParameter(AEvent, kEventParamAccessibleAttributeValue, typeCFNumberRef, SetEventParameter(AEvent, kEventParamAccessibleAttributeValue, typeCFNumberRef,
SizeOf(lOutputNum), @lOutputNum); SizeOf(lOutputNum), @lOutputNum);
@ -2055,7 +2055,8 @@ var
iStart : integer; iStart : integer;
iEnd : integer; iEnd : integer;
begin begin
Result := GetTXNSelection(iStart{%H-},{%H-} iEnd); iEnd := 0;
Result := GetTXNSelection(iStart{%H-},{%H-}iEnd);
if not Result then if not Result then
begin begin
iStart := 0; iStart := 0;
@ -2279,7 +2280,7 @@ begin
W := PWideChar(Data^); W := PWideChar(Data^);
Result := UTF16ToUTF8(Copy(W, 0, GetHandleSize(Data) div 2)); Result := LazUTF8.UTF16ToUTF8(Copy(W, 0, GetHandleSize(Data) div 2));
// remove CRLF // remove CRLF
if (Result <> '') and (Result[Length(Result)] in [#10, #13]) then if (Result <> '') and (Result[Length(Result)] in [#10, #13]) then
Delete(Result, Length(Result), 1); Delete(Result, Length(Result), 1);
@ -2320,7 +2321,7 @@ const
CarbonEoln = #13; CarbonEoln = #13;
begin begin
if AIndex < 0 then AIndex := 0; if AIndex < 0 then AIndex := 0;
W := UTF8ToUTF16(S); W := LazUTF8.UTF8ToUTF16(S);
LineCnt:=GetLineCount; LineCnt:=GetLineCount;
if LineCnt = 0 then if LineCnt = 0 then
@ -2341,6 +2342,7 @@ begin
p:=nil; p:=nil;
if W<>'' then if W<>'' then
p:=@W[1]; p:=@W[1];
//debugln(['TCarbonMemo.InsertLine Index=',AIndex,' LineCnt=',LineCnt,' AStart=',AStart,' len=',length(W)]);
OSError(TXNSetData(HITextViewGetTXNObject(ControlRef(Widget)), OSError(TXNSetData(HITextViewGetTXNObject(ControlRef(Widget)),
kTXNUnicodeTextData, p, Length(W) * 2, AStart, AStart), kTXNUnicodeTextData, p, Length(W) * 2, AStart, AStart),
Self, 'InsertLine', 'TXNSetData'); Self, 'InsertLine', 'TXNSetData');