Merge from trunk:

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)


svn path=/branches/gtk-2-12/; revision=19483
This commit is contained in:
Cody Russell
2008-02-06 16:35:40 +00:00
committed by Cody Russell
parent e19fe1750f
commit 2cc7978998
2 changed files with 14 additions and 1 deletions

View File

@@ -1,3 +1,12 @@
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)
2008-02-05 Matthias Clasen <mclasen@redhat.com>
Merge from trunk:

View File

@@ -2964,7 +2964,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)
gdk_synthesize_window_state (window,