callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: don't call gtk_widget_get_allocation() on NULL children

Browse Source
This commit is contained in:
Michael Natterer 2010-10-05 13:05:56 +02:00
parent 90d9bfe086
commit a472d1a400
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/gtkoffscreenbox.c
View File

@ -47,9 +47,11 @@ to_child_2 (GtkOffscreenBox *offscreen_box,
x = widget_x; x = widget_x;
y = widget_y; y = widget_y;
gtk_widget_get_allocation (offscreen_box->child1, &child_area);
if (offscreen_box->child1 && gtk_widget_get_visible (offscreen_box->child1)) 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); gtk_widget_get_allocation (offscreen_box->child2, &child_area);
@ -99,9 +101,11 @@ to_parent_2 (GtkOffscreenBox *offscreen_box,
x += child_area.width / 2; x += child_area.width / 2;
y += child_area.height / 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)) 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; *x_out = x;
*y_out = y; *y_out = y;
@ -612,6 +616,7 @@ gtk_offscreen_box_draw (GtkWidget *widget,
if (offscreen_box->child2 && gtk_widget_get_visible (offscreen_box->child2)) if (offscreen_box->child2 && gtk_widget_get_visible (offscreen_box->child2))
{ {
surface = gdk_offscreen_window_get_surface (offscreen_box->offscreen_window2); surface = gdk_offscreen_window_get_surface (offscreen_box->offscreen_window2);
gtk_widget_get_allocation (offscreen_box->child2, &child_area); gtk_widget_get_allocation (offscreen_box->child2, &child_area);
/* transform */ /* transform */