Call gdk_window_withdraw rather than gdk_window_hide; this makes things

Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw
	rather than gdk_window_hide; this makes things work
	correctly if the window is programmatically hidden while
	iconified.

diff --git a/gdk/.cvsignore b/gdk/.cvsignore
index f939257a54e7f601566bdd49694aa4d299005fd1..526719892dd245aca413164a7e0140ea2c7311a7 100644 (file)
--- a/gdk/.cvsignore
+++ b/gdk/.cvsignore
@@ -4,7 +4,7 @@ Makefile.in
 .deps
 _libs
 .libs
-libgdk-1.1.la
+libgdk-*.la
 gdkcursors.h
 gdkkeysyms.h
 libgdk.la

diff --git a/gdk/nanox/.cvsignore b/gdk/nanox/.cvsignore
new file mode 100644 (file)
index 0000000..4ef31f4
--- /dev/null
+++ b/gdk/nanox/.cvsignore
@@ -0,0 +1,8 @@
+*.lo
+Makefile
+Makefile.in
+.deps
+_libs
+.libs
+*.la
+gxid

diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index d410a2780bed8cec8e9cbc8be0566af9618e91c8..5c5562c3c273e441fc36a0609838a3a264e4f9e7 100644 (file)
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -4,7 +4,7 @@ Makefile.in
 .deps
 _libs
 .libs
-libgtk-1.1.la
+libgtk-*.la
 testcalendar
 testgtk
 testinput

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 2cfc579cc9e4d03336258a00c28dd57a808e5c08..1be60d5b03f6f95eb190e1fcc1234afc5961038d 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -981,7 +981,7 @@ gtk_window_unmap (GtkWidget *widget)
   g_return_if_fail (GTK_IS_WINDOW (widget));
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
-  gdk_window_hide (widget->window);
+  gdk_window_withdraw (widget->window);
 
   window = GTK_WINDOW (widget);
   window->use_uposition = TRUE;

diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index 9df3f2e0c62a50d46f938b1263cd0597fb790393..6a2303ce68bad2b4841578e3c9a8f6db3b3866d0 100644 (file)
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -269,7 +269,7 @@ create_buttons (void)
   if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
-    gtk_widget_destroy (window);
+    gtk_widget_hide (window);
 }
 
 /*

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 9df3f2e0c62a50d46f938b1263cd0597fb790393..6a2303ce68bad2b4841578e3c9a8f6db3b3866d0 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -269,7 +269,7 @@ create_buttons (void)
   if (!GTK_WIDGET_VISIBLE (window))
     gtk_widget_show_all (window);
   else
-    gtk_widget_destroy (window);
+    gtk_widget_hide (window);
 }
 
 /*