diff options
author | Javier Jardón <jjardon@gnome.org> | 2010-09-09 15:35:58 +0200 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2010-09-13 21:26:01 +0200 |
commit | 9e81022bf6b7a5c25584b9eeea360cdf38cd6949 (patch) | |
tree | 3b2d02c989bb9042087b384b8637d19dc9e807e2 /gtk/gtkassistant.c | |
parent | 153bfacde0d9c7a533c0936f3078db58cf672aac (diff) | |
download | gtk+-9e81022bf6b7a5c25584b9eeea360cdf38cd6949.tar.gz |
Use gtk_size_request_get_size() instead deprecated gtk_widget_get_child_requisition()
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=629177
Diffstat (limited to 'gtk/gtkassistant.c')
-rw-r--r-- | gtk/gtkassistant.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 5cbfe90214..334e789202 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -58,6 +58,7 @@ #include "gtkimage.h" #include "gtklabel.h" #include "gtksizegroup.h" +#include "gtksizerequest.h" #include "gtkstock.h" #include "gtkintl.h" @@ -1224,7 +1225,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); /* Header */ - gtk_widget_get_child_requisition (priv->header_image, &header_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->header_image), + &header_requisition, NULL); header_allocation.x = border_width + header_padding; header_allocation.y = border_width + header_padding; @@ -1234,7 +1236,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (priv->header_image, &header_allocation); /* Action area */ - gtk_widget_get_child_requisition (priv->action_area, &action_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->action_area), + &action_requisition, NULL); child_allocation.x = border_width; child_allocation.y = allocation->height - border_width - action_requisition.height; @@ -1247,7 +1250,8 @@ gtk_assistant_size_allocate (GtkWidget *widget, gtk_widget_get_allocation (priv->action_area, &action_area_allocation); /* Sidebar */ - gtk_widget_get_child_requisition (priv->sidebar_image, &sidebar_requisition); + gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->sidebar_image), + &sidebar_requisition, NULL); if (rtl) child_allocation.x = allocation->width - border_width - sidebar_requisition.width; |