From 49f04ab86a4472efda8e5db737ec3ec26cd6700b Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 1 Jan 2008 13:00:28 +0000 Subject: [PATCH] fix crash while creating PreviewFileControl git-svn-id: trunk@13556 - --- lcl/interfaces/gtk/gtkint.pp | 2 +- lcl/interfaces/gtk/gtkwsextdlgs.pp | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lcl/interfaces/gtk/gtkint.pp b/lcl/interfaces/gtk/gtkint.pp index 91d20132c4..caf11ee97c 100644 --- a/lcl/interfaces/gtk/gtkint.pp +++ b/lcl/interfaces/gtk/gtkint.pp @@ -312,7 +312,7 @@ uses // GtkWSDirSel, // GtkWSEditBtn, GtkWSExtCtrls, -// GtkWSExtDlgs, + GtkWSExtDlgs, // GtkWSFileCtrl, GtkWSForms, GtkWSGrids, diff --git a/lcl/interfaces/gtk/gtkwsextdlgs.pp b/lcl/interfaces/gtk/gtkwsextdlgs.pp index bf9c2c22de..4c7c0ddd91 100644 --- a/lcl/interfaces/gtk/gtkwsextdlgs.pp +++ b/lcl/interfaces/gtk/gtkwsextdlgs.pp @@ -27,7 +27,14 @@ unit GtkWSExtDlgs; interface uses - ExtDlgs, WSExtDlgs, WSLCLClasses; + {$IFDEF gtk2} + glib2, gdk2pixbuf, gdk2, gtk2, Pango, + {$ELSE} + glib, gdk, gtk, gdkpixbuf, GtkFontCache, + {$ENDIF} + Classes, Controls, ExtDlgs, LCLType, + WSExtDlgs, WSLCLClasses, + GtkDef, GtkProc, GtkWsControls, GtkInt; type @@ -38,7 +45,7 @@ type protected class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); virtual; public - class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; + class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override; end; { TGtkWSPreviewFileDialog }