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

[bratsche svn gnome org]

Author: bratsche
Date: Sun Mar 23 15:39:45 2008
New Revision: 19928
URL: http://svn.gnome.org/viewvc/gtk+?rev=19928&view=rev

Log:
2008-03-23  Cody Russell  <bratsche gnome org>

	Merge from trunk:

        * gdk/win32/gdkevents-win32.c (show_window_recurse):
        Check window state for GDK_WINDOW_STATE_ICONIFIED before doing
        ShowWindow (SW_RESTORE).  This fixes a problem where tearing off
        menus from a maximized window would force the window to restore
        its size. (#518846)



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	Sun Mar 23 15:39:45 2008
@@ -1361,9 +1361,16 @@
       if (GDK_WINDOW_IS_MAPPED (window))
 	{
 	  if (!hide_window)
-	    ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+	    {
+	      if (GDK_WINDOW_OBJECT (window)->state & GDK_WINDOW_STATE_ICONIFIED)
+		{
+		  ShowWindow (GDK_WINDOW_HWND (window), SW_RESTORE);
+		}
+	    }
 	  else
-	    ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+	    {
+	      ShowWindow (GDK_WINDOW_HWND (window), SW_MINIMIZE);
+	    }
 	}
 
       impl->changing_state = FALSE;