From d20f251adf0a21e7e1201ddc53511f0656189aaa Mon Sep 17 00:00:00 2001 From: andrew Date: Fri, 26 Oct 2007 03:27:50 +0000 Subject: [PATCH] Fixed compiliation for gtk1 git-svn-id: trunk@12592 - --- lcl/interfaces/gtk/gtk1object.inc | 4 ++++ lcl/interfaces/gtk/gtkproc.inc | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lcl/interfaces/gtk/gtk1object.inc b/lcl/interfaces/gtk/gtk1object.inc index 9f498109e8..ec8b3e9119 100644 --- a/lcl/interfaces/gtk/gtk1object.inc +++ b/lcl/interfaces/gtk/gtk1object.inc @@ -2196,7 +2196,11 @@ var SrcStartBit := 7; ShiftInc := -1; {$ifdef HasX} + {$IFDEF Gtk1} + XImage := PGdkImagePrivate(AImage)^.ximage; + {$ELSE} XImage := gdk_x11_image_get_ximage(AImage); + {$ENDIF} if XImage^.bitmap_bit_order = LSBFirst then begin SrcStartBit := 0; diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc index 3eff1059e1..89c5d01a7c 100644 --- a/lcl/interfaces/gtk/gtkproc.inc +++ b/lcl/interfaces/gtk/gtkproc.inc @@ -1464,7 +1464,11 @@ begin {$ifdef hasx} if AImage = nil then Exit; + {$IFDEF Gtk1} + XImage := PGdkImagePrivate(AImage)^.ximage; + {$ELSE} XImage := gdk_x11_image_get_ximage(AImage); + {$ENDIF} if XImage^.bitmap_bit_order = LSBFirst then Exit; {$endif} @@ -5770,7 +5774,7 @@ begin if CanRequestAlpha then Exit; // we're done if not AIncludeAplha then Exit; - {$ifdef VER2_0} + {$if defined(VER2_0) or defined(GTK1)} pixbuf := gdk_pixbuf_add_alpha(Result, false, #0,#0,#0); {$else} pixbuf := gdk_pixbuf_add_alpha(Result, false, 0,0,0);