From fd3a03f4945c99e74447c51d3c38353d92ca1533 Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 17 May 2009 11:29:53 +0000 Subject: [PATCH] Gtk widget => changed from ifdef gtk2 => ifNdef gtk1 git-svn-id: trunk@20007 - --- lcl/interfaces/gtk/gtkcallback.inc | 4 ++-- lcl/interfaces/gtk/gtkwinapi.inc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lcl/interfaces/gtk/gtkcallback.inc b/lcl/interfaces/gtk/gtkcallback.inc index 94460b252f..eb46fba74b 100644 --- a/lcl/interfaces/gtk/gtkcallback.inc +++ b/lcl/interfaces/gtk/gtkcallback.inc @@ -28,7 +28,7 @@ {$ENDIF} function DoDeliverPaintMessage(const Target: TObject; var PaintMsg: TLMPaint): PtrInt; -{$ifdef gtk2} +{$ifndef gtk1} var WidgetInfo: PWidgetInfo; {$endif} @@ -51,7 +51,7 @@ begin Result := DeliverMessage(Target, PaintMsg); - {$ifdef gtk2} + {$ifndef gtk1} if (TObject(Target) is TCustomControl) then begin WidgetInfo := GetWidgetInfo(PGtkWidget(TCustomControl(Target).Handle), False); if WidgetInfo <> nil then diff --git a/lcl/interfaces/gtk/gtkwinapi.inc b/lcl/interfaces/gtk/gtkwinapi.inc index b0d304f5f2..3d66f7a20e 100644 --- a/lcl/interfaces/gtk/gtkwinapi.inc +++ b/lcl/interfaces/gtk/gtkwinapi.inc @@ -6842,7 +6842,7 @@ var gdkRect : TGDKRectangle; Widget, PaintWidget: PGtkWidget; LCLObject: TObject; - {$IfDef GTK2} + {$IfNDef GTK1} WidgetInfo: PWidgetInfo; {$ENDIF} r: TRect; @@ -6885,7 +6885,7 @@ begin gdkRect.Width := (Rect^.Right - Rect^.Left); gdkRect.Height := (Rect^.Bottom - Rect^.Top); - {$IfDef GTK2} + {$IfNDef GTK1} if (PaintWidget<>nil) and GTK_WIDGET_NO_WINDOW(PaintWidget) and (not GtkWidgetIsA(PGTKWidget(PaintWidget),GTKAPIWidget_GetType)) and (Rect<>nil) @@ -6905,7 +6905,7 @@ begin gtk_widget_queue_draw_area(PaintWidget, gdkRect.X,gdkRect.Y,gdkRect.Width,gdkRect.Height); - {$IfDef GTK2} + {$IfNDef GTK1} //DebugLn(['TGtkWidgetSet.InvalidateRect ',GetWidgetDebugReport(Widget),' IsAPI=',GtkWidgetIsA(PGTKWidget(Widget),GTKAPIWidget_GetType)]); if GtkWidgetIsA(PGTKWidget(Widget),GTKAPIWidget_GetType) then GTKAPIWidget_InvalidateCaret(PGTKAPIWidget(Widget));