fixed gtk2 compilation

git-svn-id: trunk@9256 -
This commit is contained in:
mattias 2006-05-09 07:57:41 +00:00
parent 260a95030f
commit 173f5c5a42
2 changed files with 2 additions and 9 deletions

View File

@ -37,17 +37,12 @@ uses
{$endif} {$endif}
SysUtils, Classes, FPCAdds, SysUtils, Classes, FPCAdds,
{$IFDEF UNIX} {$IFDEF UNIX}
baseunix, unix, baseunix, unix, XAtom,
{$IFDEF GTK1} X, XLib, XUtil, //Font retrieval and Keyboard handling
X, XLib, XUtil, XAtom, //Font retrieval and Keyboard handling
{$ENDIF not Gtk1}
{$ENDIF} {$ENDIF}
InterfaceBase, InterfaceBase,
{$IFDEF gtk2} {$IFDEF gtk2}
glib2, gdk2pixbuf, gdk2, gtk2, Pango, glib2, gdk2pixbuf, gdk2, gtk2, Pango,
{$IFDEF UNIX}
X, XLib, XUtil, //Keyboard handling
{$ENDIF}
{$ELSE} {$ELSE}
glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} GtkFontCache, glib, gdk, gtk, {$Ifndef NoGdkPixbufLib}gdkpixbuf,{$EndIf} GtkFontCache,
{$ENDIF} {$ENDIF}

View File

@ -417,8 +417,6 @@ var
Underline, Underline,
StrikeOut : Boolean; StrikeOut : Boolean;
RGBColor : Longint;
Layout : PPangoLayout; Layout : PPangoLayout;
UseFontDesc : PPangoFontDescription; UseFontDesc : PPangoFontDescription;
AttrList : PPangoAttrList; AttrList : PPangoAttrList;