diff --git a/components/synedit/synedit.pp b/components/synedit/synedit.pp index 09cc4a0cca..1d516bc8aa 100644 --- a/components/synedit/synedit.pp +++ b/components/synedit/synedit.pp @@ -6359,12 +6359,11 @@ begin Helper := Copy(Temp, CaretX, counter); {$IFDEF SYN_LAZARUS} {$IFDEF USE_UTF8BIDI_LCL} -WriteLn('passed her!'); CaretNew.X := CaretX; - utf8bidi.insert(Temp,AChar,CaretNew.X); + utf8bidi.insert(AChar,Temp,CaretNew.X); CaretX := CaretNew.X; {$ELSE USE_UTF8BIDI_LCL} - insert(Temp,AChar,CaretX); + System.insert(AChar,Temp,CaretX); {$ENDIF USE_UTF8BIDI_LCL} {$ELSE} Temp[CaretX] := AChar; diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index 68605b1b33..a4802f64c4 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -2167,7 +2167,7 @@ begin if (Event^.length>0) and (Event^.length<7) then begin SetLength(Character,Event^.length); System.Move(Event^.thestring^,Character[1],length(Character)); - end + end; {$ELSE GTK1} Character := UnicodeToUTF8(gdk_keyval_to_unicode(Event^.KeyVal)); {$ENDIF GTK1} @@ -7235,6 +7235,9 @@ end; { ============================================================================= $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 * fixed theType/_Type related to GTK1/GTK2 difference * fix return error which causes GTK2 not to call AfterEvent diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp index d612d9179b..ca69c58c00 100644 --- a/lcl/interfaces/gtk/gtkproc.pp +++ b/lcl/interfaces/gtk/gtkproc.pp @@ -756,10 +756,10 @@ procedure EndGDKErrorTrap; implementation +{$IFDEF USE_UTF8BIDI_LCL} uses - {$IFDEF USE_UTF8BIDI_LCL} utf8bidi; - {$ENDIF} +{$ENDIF} const VKEY_FLAG_SHIFT = $01;