diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp index 627d782583..51944b5906 100644 --- a/lcl/interfaces/gtk/gtkproc.pp +++ b/lcl/interfaces/gtk/gtkproc.pp @@ -37,17 +37,12 @@ uses {$endif} SysUtils, Classes, FPCAdds, {$IFDEF UNIX} - baseunix, unix, - {$IFDEF GTK1} - X, XLib, XUtil, XAtom, //Font retrieval and Keyboard handling - {$ENDIF not Gtk1} + baseunix, unix, XAtom, + X, XLib, XUtil, //Font retrieval and Keyboard handling {$ENDIF} InterfaceBase, {$IFDEF gtk2} glib2, gdk2pixbuf, gdk2, gtk2, Pango, - {$IFDEF UNIX} - X, XLib, XUtil, //Keyboard handling - {$ENDIF} {$ELSE} glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} GtkFontCache, {$ENDIF} diff --git a/lcl/interfaces/gtk2/gtk2winapi.inc b/lcl/interfaces/gtk2/gtk2winapi.inc index e4afc90edd..6c0f674b25 100644 --- a/lcl/interfaces/gtk2/gtk2winapi.inc +++ b/lcl/interfaces/gtk2/gtk2winapi.inc @@ -417,8 +417,6 @@ var Underline, StrikeOut : Boolean; - RGBColor : Longint; - Layout : PPangoLayout; UseFontDesc : PPangoFontDescription; AttrList : PPangoAttrList;