From f9249c92726b34ce9ff22e23ebdf144a0afe662c Mon Sep 17 00:00:00 2001
From: paul <paul@lazarus-ide.org>
Date: Mon, 29 Sep 2008 05:39:50 +0000
Subject: [PATCH] gtk2: use gtk_widget_set_size_request instead of
 gtk_widget_set_usize since last is deprecated in gtk2

git-svn-id: trunk@16783 -
---
 lcl/interfaces/gtk/gtkproc.inc        | 12 ++++++++++--
 lcl/interfaces/gtk2/gtk2wscomctrls.pp |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 4c5c87a602..1a2b907f40 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -6456,7 +6456,11 @@ begin
   Widget := PGtkWidget(AWinControl.Handle);
   // set size to default
   //DebugLn(['GetGTKDefaultWidgetSize ',GetWidgetDebugReport(Widget)]);
-  gtk_widget_set_usize(Widget,-1,-1);
+  {$IFDEF GTK1}
+  gtk_widget_set_usize(Widget, -1, -1); // deprecated in gtk2
+  {$ELSE}
+  gtk_widget_set_size_request(Widget, -1, -1);
+  {$ENDIF}
   // ask default size
   gtk_widget_size_request(Widget,@Requisition);
   PreferredWidth:=Requisition.width;
@@ -6486,7 +6490,11 @@ begin
    ' PreferredWidth=',PreferredWidth,' PreferredHeight=',PreferredHeight,
    ' WithThemeSpace=',WithThemeSpace]);}
   // set new size
-  gtk_widget_set_usize(Widget,AWinControl.Width,AWinControl.Height);
+  {$IFDEF GTK1}
+  gtk_widget_set_usize(Widget, AWinControl.Width, AWinControl.Height);
+  {$ELSE}
+  gtk_widget_set_size_request(Widget, AWinControl.Width, AWinControl.Height);
+  {$ENDIF}
   //debugln('GetGTKDefaultSize PreferredWidth=',dbgs(PreferredWidth),' PreferredHeight=',dbgs(PreferredHeight));
 end;
 
diff --git a/lcl/interfaces/gtk2/gtk2wscomctrls.pp b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
index ce18e6dc3f..a032b4b4e5 100644
--- a/lcl/interfaces/gtk2/gtk2wscomctrls.pp
+++ b/lcl/interfaces/gtk2/gtk2wscomctrls.pp
@@ -516,7 +516,7 @@ var
 begin
   StatusBarWidget:=GetStyleWidget(lgsStatusBar);
   // set size to default
-  gtk_widget_set_usize(StatusBarWidget,-1,-1);
+  gtk_widget_set_size_request(StatusBarWidget, -1, -1);
   // ask default size
   gtk_widget_size_request(StatusBarWidget,@Requisition);
   PreferredHeight:=Requisition.height;