gtk2: use gtk_widget_set_size_request instead of gtk_widget_set_usize since last is deprecated in gtk2

git-svn-id: trunk@16783 -
This commit is contained in:
paul 2008-09-29 05:39:50 +00:00
parent dacd507af3
commit f9249c9272
2 changed files with 11 additions and 3 deletions

View File

@ -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;

View File

@ -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;