diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-10-29 12:58:24 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-10-30 17:37:02 +0900 |
| commit | ef03dc3fc6c72cf092b8b0ee95940e33f2ff9299 (patch) | |
| tree | a255bdb6b133a7a10123f25350578a9452374aa9 /gtk/gtkbbox.c | |
| parent | 70bef431b0276a4892f35b1f3ed1ae639ac216af (diff) | |
| download | gtk+-ef03dc3fc6c72cf092b8b0ee95940e33f2ff9299.tar.gz | |
Don't set get_preferred_width_for_height to NULL
The size request machinery expects that it is non-NULL.
Diffstat (limited to 'gtk/gtkbbox.c')
| -rw-r--r-- | gtk/gtkbbox.c | 43 |
1 files changed, 35 insertions, 8 deletions
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index f1531b1eef..045a3a2288 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -81,12 +81,21 @@ static void gtk_button_box_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gtk_button_box_get_preferred_width (GtkWidget *widget, - gint *minimum, - gint *natural); -static void gtk_button_box_get_preferred_height (GtkWidget *widget, - gint *minimum, - gint *natural); +static void gtk_button_box_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural); +static void gtk_button_box_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural); +static void gtk_button_box_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum, + gint *natural); +static void gtk_button_box_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural); + static void gtk_button_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void gtk_button_box_remove (GtkContainer *container, @@ -126,8 +135,8 @@ gtk_button_box_class_init (GtkButtonBoxClass *class) widget_class->get_preferred_width = gtk_button_box_get_preferred_width; widget_class->get_preferred_height = gtk_button_box_get_preferred_height; - widget_class->get_preferred_width_for_height = NULL; - widget_class->get_preferred_height_for_width = NULL; + widget_class->get_preferred_width_for_height = gtk_button_box_get_preferred_width_for_height; + widget_class->get_preferred_height_for_width = gtk_button_box_get_preferred_height_for_width; widget_class->size_allocate = gtk_button_box_size_allocate; container_class->remove = gtk_button_box_remove; @@ -644,6 +653,24 @@ gtk_button_box_get_preferred_height (GtkWidget *widget, } static void +gtk_button_box_get_preferred_width_for_height (GtkWidget *widget, + gint height, + gint *minimum, + gint *natural) +{ + gtk_button_box_get_preferred_width (widget, minimum, natural); +} + +static void +gtk_button_box_get_preferred_height_for_width (GtkWidget *widget, + gint width, + gint *minimum, + gint *natural) +{ + gtk_button_box_get_preferred_height (widget, minimum, natural); +} + +static void gtk_button_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { |