mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-05-26 01:23:10 +02:00
* fix compile probelm using gtk1
git-svn-id: trunk@5913 -
This commit is contained in:
parent
0feb2a60d9
commit
e9bf89e4df
@ -6359,12 +6359,11 @@ begin
|
|||||||
Helper := Copy(Temp, CaretX, counter);
|
Helper := Copy(Temp, CaretX, counter);
|
||||||
{$IFDEF SYN_LAZARUS}
|
{$IFDEF SYN_LAZARUS}
|
||||||
{$IFDEF USE_UTF8BIDI_LCL}
|
{$IFDEF USE_UTF8BIDI_LCL}
|
||||||
WriteLn('passed her!');
|
|
||||||
CaretNew.X := CaretX;
|
CaretNew.X := CaretX;
|
||||||
utf8bidi.insert(Temp,AChar,CaretNew.X);
|
utf8bidi.insert(AChar,Temp,CaretNew.X);
|
||||||
CaretX := CaretNew.X;
|
CaretX := CaretNew.X;
|
||||||
{$ELSE USE_UTF8BIDI_LCL}
|
{$ELSE USE_UTF8BIDI_LCL}
|
||||||
insert(Temp,AChar,CaretX);
|
System.insert(AChar,Temp,CaretX);
|
||||||
{$ENDIF USE_UTF8BIDI_LCL}
|
{$ENDIF USE_UTF8BIDI_LCL}
|
||||||
{$ELSE}
|
{$ELSE}
|
||||||
Temp[CaretX] := AChar;
|
Temp[CaretX] := AChar;
|
||||||
|
@ -2167,7 +2167,7 @@ begin
|
|||||||
if (Event^.length>0) and (Event^.length<7) then begin
|
if (Event^.length>0) and (Event^.length<7) then begin
|
||||||
SetLength(Character,Event^.length);
|
SetLength(Character,Event^.length);
|
||||||
System.Move(Event^.thestring^,Character[1],length(Character));
|
System.Move(Event^.thestring^,Character[1],length(Character));
|
||||||
end
|
end;
|
||||||
{$ELSE GTK1}
|
{$ELSE GTK1}
|
||||||
Character := UnicodeToUTF8(gdk_keyval_to_unicode(Event^.KeyVal));
|
Character := UnicodeToUTF8(gdk_keyval_to_unicode(Event^.KeyVal));
|
||||||
{$ENDIF GTK1}
|
{$ENDIF GTK1}
|
||||||
@ -7235,6 +7235,9 @@ end;
|
|||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
|
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.301 2004/09/02 16:01:24 mazen
|
||||||
|
* fix compile probelm using gtk1
|
||||||
|
|
||||||
Revision 1.300 2004/09/02 14:58:14 mazen
|
Revision 1.300 2004/09/02 14:58:14 mazen
|
||||||
* fixed theType/_Type related to GTK1/GTK2 difference
|
* fixed theType/_Type related to GTK1/GTK2 difference
|
||||||
* fix return error which causes GTK2 not to call AfterEvent
|
* fix return error which causes GTK2 not to call AfterEvent
|
||||||
|
@ -756,8 +756,8 @@ procedure EndGDKErrorTrap;
|
|||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
uses
|
|
||||||
{$IFDEF USE_UTF8BIDI_LCL}
|
{$IFDEF USE_UTF8BIDI_LCL}
|
||||||
|
uses
|
||||||
utf8bidi;
|
utf8bidi;
|
||||||
{$ENDIF}
|
{$ENDIF}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user