summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-20 01:27:32 -0400
committerTristan Van Berkom <tristan.van.berkom@gmail.com>2010-04-20 01:27:32 -0400
commitb7a05d1832560e7c114c35f1833d0bc22e4cd8ce (patch)
tree261407132398c056618c6f0a66def80f84c89c00
parentc927f5e60d0710f705392d51eaf073de3e9df4d8 (diff)
downloadgtk+-b7a05d1832560e7c114c35f1833d0bc22e4cd8ce.tar.gz
Fixed missing return from get_desired_width/height in GtkViewport (causing testgtk to have a small width).
-rw-r--r--gtk/gtkviewport.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 103a8572f6..e57f75699f 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -881,6 +881,12 @@ gtk_viewport_get_desired_size (GtkExtendedLayout *layout,
minimum += child_min;
natural += child_nat;
}
+
+ if (minimum_size)
+ *minimum_size = minimum;
+
+ if (natural_size)
+ *natural_size = natural;
}
static void