diff options
| author | Michael Natterer <mitch@gimp.org> | 2010-10-05 13:05:56 +0200 |
|---|---|---|
| committer | Michael Natterer <mitch@gimp.org> | 2010-10-05 13:05:56 +0200 |
| commit | a472d1a4005fea0adab067dea0d263d50c804574 (patch) | |
| tree | 732a4ecee5fd2aa80cecabb57104085b829c2837 /tests/gtkoffscreenbox.c | |
| parent | 90d9bfe086dc047d56fdf12335243b81b24363aa (diff) | |
| download | gtk+-a472d1a4005fea0adab067dea0d263d50c804574.tar.gz | |
tests: don't call gtk_widget_get_allocation() on NULL children
Diffstat (limited to 'tests/gtkoffscreenbox.c')
| -rw-r--r-- | tests/gtkoffscreenbox.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c index a9722efd80..fe84db2109 100644 --- a/tests/gtkoffscreenbox.c +++ b/tests/gtkoffscreenbox.c @@ -47,9 +47,11 @@ to_child_2 (GtkOffscreenBox *offscreen_box, x = widget_x; y = widget_y; - gtk_widget_get_allocation (offscreen_box->child1, &child_area); if (offscreen_box->child1 && gtk_widget_get_visible (offscreen_box->child1)) - y -= child_area.height; + { + gtk_widget_get_allocation (offscreen_box->child1, &child_area); + y -= child_area.height; + } gtk_widget_get_allocation (offscreen_box->child2, &child_area); @@ -99,9 +101,11 @@ to_parent_2 (GtkOffscreenBox *offscreen_box, x += child_area.width / 2; y += child_area.height / 2; - gtk_widget_get_allocation (offscreen_box->child1, &child_area); if (offscreen_box->child1 && gtk_widget_get_visible (offscreen_box->child1)) - y += child_area.height; + { + gtk_widget_get_allocation (offscreen_box->child1, &child_area); + y += child_area.height; + } *x_out = x; *y_out = y; @@ -612,6 +616,7 @@ gtk_offscreen_box_draw (GtkWidget *widget, if (offscreen_box->child2 && gtk_widget_get_visible (offscreen_box->child2)) { surface = gdk_offscreen_window_get_surface (offscreen_box->offscreen_window2); + gtk_widget_get_allocation (offscreen_box->child2, &child_area); /* transform */ |