paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-12 14:00:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix gtk1 compilation

Browse Source 
git-svn-id: trunk@13029 -
This commit is contained in:
paul 2007-11-26 08:54:03 +00:00
parent de9e54e0ad
commit fcca92b95d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/interfaces/gtk/gtkwsstdctrls.pp
View File

@ -1649,9 +1649,9 @@ end;
class function TGtkWSCustomGroupBox.CreateHandle( class function TGtkWSCustomGroupBox.CreateHandle(
const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle;
var var
{$IFNDEF GtkFixedWithWindow} {$if not defined(gtk1) and not defined(GtkFixedWithWindow)}
EventBox: PGtkWidget; EventBox: PGtkWidget;
{$ENDIF} {$endif}
TempWidget: PGTKWidget; // pointer to gtk-widget (local use when neccessary) TempWidget: PGTKWidget; // pointer to gtk-widget (local use when neccessary)
p : pointer; // ptr to the newly created GtkWidget p : pointer; // ptr to the newly created GtkWidget
Allocation: TGTKAllocation; Allocation: TGTKAllocation;
@ -1662,7 +1662,13 @@ begin
else else
P := gtk_frame_new(nil); P := gtk_frame_new(nil);
WidgetInfo := CreateWidgetInfo(P, AWinControl, AParams); WidgetInfo := CreateWidgetInfo(P, AWinControl, AParams);
{$IFNDEF GtkFixedWithWindow} {$if defined(gtk1) or defined(GtkFixedWithWindow)}
TempWidget := CreateFixedClientWidget;
gtk_container_add(GTK_CONTAINER(p), TempWidget);
WidgetInfo^.ClientWidget := TempWidget;
WidgetInfo^.CoreWidget := TempWidget;
gtk_object_set_data(PGtkObject(TempWidget), 'widgetinfo', WidgetInfo);
{$else}
EventBox := gtk_event_box_new; EventBox := gtk_event_box_new;
gtk_event_box_set_visible_window(PGtkEventBox(EventBox), False); gtk_event_box_set_visible_window(PGtkEventBox(EventBox), False);
TempWidget := CreateFixedClientWidget(false); TempWidget := CreateFixedClientWidget(false);
@ -1673,13 +1679,7 @@ begin
WidgetInfo^.CoreWidget := EventBox; WidgetInfo^.CoreWidget := EventBox;
gtk_object_set_data(PGtkObject(TempWidget), 'widgetinfo', WidgetInfo); gtk_object_set_data(PGtkObject(TempWidget), 'widgetinfo', WidgetInfo);
gtk_object_set_data(PGtkObject(EventBox), 'widgetinfo', WidgetInfo); gtk_object_set_data(PGtkObject(EventBox), 'widgetinfo', WidgetInfo);
{$ELSE} {$endif}
TempWidget := CreateFixedClientWidget;
gtk_container_add(GTK_CONTAINER(p), TempWidget);
WidgetInfo^.ClientWidget := TempWidget;
WidgetInfo^.CoreWidget := TempWidget;
gtk_object_set_data(PGtkObject(TempWidget), 'widgetinfo', WidgetInfo);
{$ENDIF}
gtk_widget_show(TempWidget); gtk_widget_show(TempWidget);
gtk_widget_show(P); gtk_widget_show(P);