From: Anders Carlsson Date: Thu, 7 Nov 2002 19:53:49 +0000 (+0000) Subject: Check for NULL children, #97913. X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9232e400a18d06362b0a7f2991addc071e186925;p=~andy%2Fgtk Check for NULL children, #97913. 2002-11-07 Anders Carlsson * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): Check for NULL children, #97913. --- diff --git a/ChangeLog b/ChangeLog index aca30263e..c6be72645 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index aca30263e..c6be72645 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index aca30263e..c6be72645 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index aca30263e..c6be72645 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index aca30263e..c6be72645 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index aca30263e..c6be72645 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-11-07 Anders Carlsson + + * gtk/gtkhpaned.c: (gtk_hpaned_size_allocate): + * gtk/gtkvpaned.c: (gtk_vpaned_size_allocate): + Check for NULL children, #97913. + Thu Nov 7 14:24:45 2002 Owen Taylor * gtk/gtkhandlebox.c: Add a snap_edge_set property to diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c index 3aad90a5e..298705821 100644 --- a/gtk/gtkhpaned.c +++ b/gtk/gtkhpaned.c @@ -212,9 +212,11 @@ gtk_hpaned_size_allocate (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) gdk_window_hide (paned->handle); - - gtk_widget_set_child_visible (paned->child1, TRUE); - gtk_widget_set_child_visible (paned->child2, TRUE); + + if (paned->child1) + gtk_widget_set_child_visible (paned->child1, TRUE); + if (paned->child2) + gtk_widget_set_child_visible (paned->child2, TRUE); child_allocation.x = widget->allocation.x + border_width; child_allocation.y = widget->allocation.y + border_width; diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c index b7067e7c2..221cd2dc0 100644 --- a/gtk/gtkvpaned.c +++ b/gtk/gtkvpaned.c @@ -212,9 +212,11 @@ gtk_vpaned_size_allocate (GtkWidget *widget, if (GTK_WIDGET_REALIZED (widget)) gdk_window_hide (paned->handle); - - gtk_widget_set_child_visible (paned->child1, TRUE); - gtk_widget_set_child_visible (paned->child2, TRUE); + + if (paned->child1) + gtk_widget_set_child_visible (paned->child1, TRUE); + if (paned->child2) + gtk_widget_set_child_visible (paned->child2, TRUE); child_allocation.x = widget->allocation.x + border_width; child_allocation.y = widget->allocation.y + border_width;