gtk+ r19478 - in branches/gtk-2-10: . gdk/win32

[bratsche svn gnome org]

Author: bratsche
Date: Tue Feb  5 23:47:25 2008
New Revision: 19478
URL: http://svn.gnome.org/viewvc/gtk+?rev=19478&view=rev

Log:
2008-02-05  Cody Russell  <bratsche gnome org>

	Merged from trunk:

        * gdk/win32/gdkwindow-win32.c (_gdk_modal_current): Walk
        down the stack until we get to a window that is mapped.
        Otherwise hiding a window will cause all windows in the app
        to be blocked. (#514643)



Modified:
   branches/gtk-2-10/ChangeLog
   branches/gtk-2-10/gdk/win32/gdkwindow-win32.c

Modified: branches/gtk-2-10/gdk/win32/gdkwindow-win32.c
==============================================================================
--- branches/gtk-2-10/gdk/win32/gdkwindow-win32.c	(original)
+++ branches/gtk-2-10/gdk/win32/gdkwindow-win32.c	Tue Feb  5 23:47:25 2008
@@ -2112,7 +2112,21 @@
 GdkWindow *
 _gdk_modal_current ()
 {
-  return modal_window_stack != NULL ? modal_window_stack->data : NULL;
+  if (modal_window_stack != NULL)
+    {
+      GSList *tmp = modal_window_stack;
+
+      while (tmp != NULL && !GDK_WINDOW_IS_MAPPED (tmp->data))
+	{
+	  tmp = g_slist_next (tmp);
+	}
+
+      return tmp != NULL ? tmp->data : NULL;
+    }
+  else
+    {
+      return NULL;
+    }
 }
 
 void