gtk+ r19483 - in branches/gtk-2-12: . gdk/win32

[bratsche svn gnome org]

Author: bratsche
Date: Wed Feb  6 16:35:40 2008
New Revision: 19483
URL: http://svn.gnome.org/viewvc/gtk+?rev=19483&view=rev

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

	Merge from trunk:

        * gdk/win32/gdkevents-win32.c: Check if the window is a temp window,
        otherwise things get wonky when you click on a menu.  This fixes
        a regression caused in #505928.  Thanks to Tor for spotting this
        one!  (#514789)



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

Modified: branches/gtk-2-12/gdk/win32/gdkevents-win32.c
==============================================================================
--- branches/gtk-2-12/gdk/win32/gdkevents-win32.c	(original)
+++ branches/gtk-2-12/gdk/win32/gdkevents-win32.c	Wed Feb  6 16:35:40 2008
@@ -2964,7 +2964,11 @@
 					   GDK_WINDOW_STATE_MAXIMIZED |
 					   withdrawn_bit,
 					   0);
-	      show_window_internal (window, FALSE);
+
+	      if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_TEMP)
+		{
+		  show_window_internal (window, FALSE);
+		}
 	    }
 	  else if (msg->wParam == SIZE_MAXIMIZED)
 	    gdk_synthesize_window_state (window,