Check if the window is a temp window, otherwise things get wonky when you

2008-02-06  Cody Russell  <bratsche@gnome.org>

        * 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)

svn path=/trunk/; revision=19482

diff --git a/ChangeLog b/ChangeLog
index f2804237736b5638a008db05300f6c882447c2af..7427e6afc302802ecde7c5d563ef330ca3bb66cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-06  Cody Russell  <bratsche@gnome.org>
+
+       * 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)
+
 2008-02-06  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkcontainer.c

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 739c451ec7e7d2793afe92e3ccac4bb79b726075..989f1ef7084b77e27788158e6e5de66066a240f3 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2988,7 +2988,11 @@ gdk_event_translate (MSG  *msg,
                                           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)
            {