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

[bratsche svn gnome org]

Author: bratsche
Date: Tue Feb  5 22:27:26 2008
New Revision: 19470
URL: http://svn.gnome.org/viewvc/gtk+?rev=19470&view=rev

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

        Merged from trunk:

        * gdk/win32/gdkevents-win32.c (show_window_recurse): Check that
        the window is mapped before setting SW_RESTORE or SW_MINIMIZE.
        Fixes a regression caused by #164537 patch where transient
        windows that are hidden get shown (incorrectly) when their
        parents are minimized. (#504984)



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

Modified: branches/gtk-2-10/gdk/win32/gdkevents-win32.c
==============================================================================
--- branches/gtk-2-10/gdk/win32/gdkevents-win32.c	(original)
+++ branches/gtk-2-10/gdk/win32/gdkevents-win32.c	Tue Feb  5 22:27:26 2008
@@ -1357,10 +1357,13 @@
 	    }
 	}
 
-      if (!hide_window)
-	ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
-      else
-	ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+      if (GDK_WINDOW_IS_MAPPED (window))
+	{
+	  if (!hide_window)
+	    ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+	  else
+	    ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+	}
 
       impl->changing_state = FALSE;
     }