summaryrefslogtreecommitdiff
path: root/gtk/gtklayout.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtklayout.c')
-rw-r--r--gtk/gtklayout.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 4702f9b33f..c19adfdef1 100644
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -343,11 +343,11 @@ gtk_layout_class_init (GtkLayoutClass *class)
widget_class->draw = gtk_layout_draw;
widget_class->expose_event = gtk_layout_expose;
- widget_class->scroll_adjustments_signal =
- gtk_signal_new ("scroll_adjustments",
+ widget_class->set_scroll_adjustments_signal =
+ gtk_signal_new ("set_scroll_adjustments",
GTK_RUN_LAST,
object_class->type,
- GTK_SIGNAL_OFFSET (GtkLayoutClass, scroll_adjustments),
+ GTK_SIGNAL_OFFSET (GtkLayoutClass, set_scroll_adjustments),
gtk_marshal_NONE__POINTER_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
@@ -356,7 +356,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
container_class->remove = gtk_layout_remove;
container_class->forall = gtk_layout_forall;
- class->scroll_adjustments = gtk_layout_set_adjustments;
+ class->set_scroll_adjustments = gtk_layout_set_adjustments;
}
static void
@@ -532,6 +532,9 @@ gtk_layout_size_request (GtkWidget *widget,
layout = GTK_LAYOUT (widget);
+ requisition->width = 0;
+ requisition->height = 0;
+
tmp_list = layout->children;
while (tmp_list)