diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-10-26 20:57:23 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-30 17:35:17 +0900 |
| commit | 42de07f2f321245f9dbfa298cbf838501821af94 (patch) | |
| tree | ef85eda17ec0cca729b5a6338b8325c1650d9689 /gtk/gtkassistant.c | |
| parent | 65dd3460ceb42e4412437b27530d00d04caea1d0 (diff) | |
| download | gtk+-42de07f2f321245f9dbfa298cbf838501821af94.tar.gz | |
Remove size_request from GtkAssistant
Diffstat (limited to 'gtk/gtkassistant.c')
| -rw-r--r-- | gtk/gtkassistant.c | 34 |
1 files changed, 31 insertions, 3 deletions
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index ba9c06ba77..7f5803d09e 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -117,8 +117,12 @@ static void gtk_assistant_init (GtkAssistant *assistant); static void gtk_assistant_destroy (GtkWidget *widget); static void gtk_assistant_style_set (GtkWidget *widget, GtkStyle *old_style); -static void gtk_assistant_size_request (GtkWidget *widget, - GtkRequisition *requisition); +static void gtk_assistant_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void gtk_assistant_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); static void gtk_assistant_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void gtk_assistant_map (GtkWidget *widget); @@ -209,7 +213,8 @@ gtk_assistant_class_init (GtkAssistantClass *class) widget_class->destroy = gtk_assistant_destroy; widget_class->style_set = gtk_assistant_style_set; - widget_class->size_request = gtk_assistant_size_request; + widget_class->get_preferred_width = gtk_assistant_get_preferred_width; + widget_class->get_preferred_height = gtk_assistant_get_preferred_height; widget_class->size_allocate = gtk_assistant_size_allocate; widget_class->map = gtk_assistant_map; widget_class->unmap = gtk_assistant_unmap; @@ -1200,6 +1205,29 @@ gtk_assistant_size_request (GtkWidget *widget, requisition->height = height; } +static void +gtk_assistant_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_assistant_size_request (widget, &requisition); + + *minimum = *natural = requisition.width; +} + +static void +gtk_assistant_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_assistant_size_request (widget, &requisition); + + *minimum = *natural = requisition.height; +} static void gtk_assistant_size_allocate (GtkWidget *widget, |