unmap clist if neccessary, unrealize title buttons.

Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>

	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
	unrealize title buttons.

8 files changed, 56 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9fa13e828..27c60c773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9fa13e828..27c60c773 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Mar 22 00:41:39 1999  Lars Hamann  <lars@gtk.org>
+
+	* gtk/gtkclist.c (gtk_clist_unrealize): unmap clist if neccessary,
+	unrealize title buttons.
+
 Fri Mar 19 16:45:27 PST 1999 Manish Singh <yosh@gimp.org>
 
         * acinclude.m4
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index fa4bfc32c..0cbbe7bd3 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -2093,7 +2093,6 @@ column_button_create (GtkCList *clist,
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
 		      (GtkSignalFunc) column_button_clicked,
 		      (gpointer) clist);
-
   gtk_widget_show (button);
 }
 
@@ -4557,8 +4556,12 @@ gtk_clist_unrealize (GtkWidget *widget)
   /* freeze the list */
   clist->freeze_count++;
 
-  /* detach optional row/cell styles */
+  if (GTK_WIDGET_MAPPED (widget))
+    gtk_clist_unmap (widget);
+
+  GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
+  /* detach optional row/cell styles */
   if (GTK_WIDGET_REALIZED (widget))
     {
       GtkCListRow *clist_row;
@@ -4585,12 +4588,16 @@ gtk_clist_unrealize (GtkWidget *widget)
   gdk_gc_destroy (clist->bg_gc);
 
   for (i = 0; i < clist->columns; i++)
-    if (clist->column[i].window)
-      {
-	gdk_window_set_user_data (clist->column[i].window, NULL);
-	gdk_window_destroy (clist->column[i].window);
-	clist->column[i].window = NULL;
-      }
+    {
+      if (clist->column[i].button)
+	gtk_widget_unrealize (clist->column[i].button);
+      if (clist->column[i].window)
+	{
+	  gdk_window_set_user_data (clist->column[i].window, NULL);
+	  gdk_window_destroy (clist->column[i].window);
+	  clist->column[i].window = NULL;
+	}
+    }
 
   gdk_window_set_user_data (clist->clist_window, NULL);
   gdk_window_destroy (clist->clist_window);
@@ -4626,10 +4633,12 @@ gtk_clist_map (GtkWidget *widget)
 
       /* map column buttons */
       for (i = 0; i < clist->columns; i++)
-	if (clist->column[i].button &&
-	    GTK_WIDGET_VISIBLE (clist->column[i].button) &&
-	    !GTK_WIDGET_MAPPED (clist->column[i].button))
-	  gtk_widget_map (clist->column[i].button);
+	{
+	  if (clist->column[i].button &&
+	      GTK_WIDGET_VISIBLE (clist->column[i].button) &&
+	      !GTK_WIDGET_MAPPED (clist->column[i].button))
+	    gtk_widget_map (clist->column[i].button);
+	}
       
       for (i = 0; i < clist->columns; i++)
 	if (clist->column[i].window && clist->column[i].button)