Check for NULL children, #97913.

2002-11-07  Anders Carlsson  <andersca@gnu.org>

	* 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 aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index aca30263eaf415423be6245368aa590e79134bdc..c6be72645762e730d1f7768a9d07ce9e8490b542 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2002-11-07  Anders Carlsson  <andersca@gnu.org>
+
+       * 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  <otaylor@redhat.com>
 
        * gtk/gtkhandlebox.c: Add a snap_edge_set property to

diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index 3aad90a5e9cd76819915119c9b53cd32b114c310..298705821013a42c9b1e155c2687f1eb3d33892d 100644 (file)
--- 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 b7067e7c2912ec2f260a9c7cd207c6b5b0503e32..221cd2dc0dce2ab41f40c55a629276173560d12a 100644 (file)
--- 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;