Correctly fix up widget->window when the widget is a NO_WINDOW container

Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
	  fix up widget->window when the widget is a
	  NO_WINDOW container widget.

8 files changed, 44 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index bba5485b9..fb440633c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bba5485b9..fb440633c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Jan 22 15:44:30 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_reparent): Correctly
+	  fix up widget->window when the widget is a
+	  NO_WINDOW container widget.
+
 Sat Jan 22 12:40:48 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gdk/gdkpixmap.c (gdk_pixmap_seek_string): Rewrite
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 5043654aa..4e026d19f 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2969,32 +2969,8 @@ gtk_widget_reparent (GtkWidget *widget,
 	{
 	  GTK_PRIVATE_UNSET_FLAG (widget, GTK_IN_REPARENT);
 	  
-	  /* OK, now fix up the widget's window. (And that for any
-	   * children, if the widget is NO_WINDOW and a container) 
-	   */
-	  if (GTK_WIDGET_NO_WINDOW (widget))
-    	    {
-	      if (GTK_IS_CONTAINER (widget))
-		gtk_container_forall (GTK_CONTAINER (widget),
-				      gtk_widget_reparent_container_child,
-				      gtk_widget_get_parent_window (widget));
-	      else
-		{
-		  GdkWindow *parent_window;
-		  
-		  parent_window = gtk_widget_get_parent_window (widget);
-		  if (parent_window != widget->window)
-		    {
-		      if (widget->window)
-			gdk_window_unref (widget->window);
-		      widget->window = parent_window;
-		      if (widget->window)
-			gdk_window_ref (widget->window);
-		    }
-		}
-	    }
-	  else
-	    gdk_window_reparent (widget->window, gtk_widget_get_parent_window (widget), 0, 0);
+	  gtk_widget_reparent_container_child (widget,
+					       gtk_widget_get_parent_window (widget));
 	}
     }
 }