Mark child->window as destroyed so we don't destroy it again.

Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>

	* gtk/gtklayout.c (gtk_layout_unrealize): Mark
	child->window as destroyed so we don't destroy
	it again.

diff --git a/ChangeLog b/ChangeLog
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3a718d560ff9b9005742dc608b81138161af5bb1..0a5638aaa985b2ad16e0f0afb290d6f5b92f0d32 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Dec 12 17:46:55 1998  Owen Taylor  <otaylor@gtk.org>
+
+       * gtk/gtklayout.c (gtk_layout_unrealize): Mark
+       child->window as destroyed so we don't destroy
+       it again.
+
 Sat Dec 12 17:18:32 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/gdkfont.c (gdk_text_extents): Corrections

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 5d54fd078eae0ac146713fda4099c253850f9e0c..6b5c1e075e1d8978500be0fe52a25f5775f50d73 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -5804,7 +5804,7 @@ draw_rows (GtkCList     *clist,
     }
 
   /* this is a small special case which exposes the bottom cell line
-   * on the last row -- it might go away if I change the wall the cell
+   * on the last row -- it might go away if I change the way the cell
    * spacings are drawn
    */
   if (clist->rows == first_row)

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index c19adfdef11d408c2551ee09d53f02acee55b1ff..ac961d87c92a34b5b97b46b33f9c41d126e90e4c 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -503,6 +503,7 @@ gtk_layout_unrealize (GtkWidget *widget)
        {
          gdk_window_set_user_data (child->window, NULL);
          gdk_window_destroy (child->window);
+         child->window = NULL;
        }
        
       tmp_list = tmp_list->next;