[gtk+] tests: don't call gtk_widget_get_allocation() on NULL children
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] tests: don't call gtk_widget_get_allocation() on NULL children
- Date: Tue, 5 Oct 2010 11:06:36 +0000 (UTC)
commit a472d1a4005fea0adab067dea0d263d50c804574
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 5 13:05:56 2010 +0200
tests: don't call gtk_widget_get_allocation() on NULL children
tests/gtkoffscreenbox.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c
index a9722ef..fe84db2 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 */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]