diff options
| author | Javier Jardón <jjardon@gnome.org> | 2010-11-17 22:57:45 +0100 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2010-11-17 23:58:53 +0100 |
| commit | f427d6998d899c0a976f1c2fe678756cfa5c6d11 (patch) | |
| tree | 28ed4ebd400642c73410158085a99b2ac2cfa40d /tests/gtkoffscreenbox.c | |
| parent | 10d5686fe19eb031af5590e956eda5e863270a93 (diff) | |
| download | gtk+-f427d6998d899c0a976f1c2fe678756cfa5c6d11.tar.gz | |
gtkoffscreenbox.c: Replace size_request by get_preferred_width/height
Diffstat (limited to 'tests/gtkoffscreenbox.c')
| -rw-r--r-- | tests/gtkoffscreenbox.c | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c index 1c19fd996e..a23a8bfa82 100644 --- a/tests/gtkoffscreenbox.c +++ b/tests/gtkoffscreenbox.c @@ -11,8 +11,12 @@ static void gtk_offscreen_box_realize (GtkWidget *widget); static void gtk_offscreen_box_unrealize (GtkWidget *widget); -static void gtk_offscreen_box_size_request (GtkWidget *widget, - GtkRequisition *requisition); +static void gtk_offscreen_box_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *maximum); +static void gtk_offscreen_box_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *maximum); static void gtk_offscreen_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static gboolean gtk_offscreen_box_damage (GtkWidget *widget, @@ -119,7 +123,8 @@ gtk_offscreen_box_class_init (GtkOffscreenBoxClass *klass) widget_class->realize = gtk_offscreen_box_realize; widget_class->unrealize = gtk_offscreen_box_unrealize; - widget_class->size_request = gtk_offscreen_box_size_request; + widget_class->get_preferred_width = gtk_offscreen_box_get_preferred_width; + widget_class->get_preferred_height = gtk_offscreen_box_get_preferred_height; widget_class->size_allocate = gtk_offscreen_box_size_allocate; widget_class->draw = gtk_offscreen_box_draw; @@ -518,6 +523,30 @@ gtk_offscreen_box_size_request (GtkWidget *widget, } static void +gtk_offscreen_box_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_offscreen_box_size_request (widget, &requisition); + + *minimum = *natural = requisition.width; +} + +static void +gtk_offscreen_box_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + GtkRequisition requisition; + + gtk_offscreen_box_size_request (widget, &requisition); + + *minimum = *natural = requisition.height; +} + +static void gtk_offscreen_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { |