diff options
| author | Cody Russell <bratsche@gnome.org> | 2008-08-22 00:31:59 +0000 |
|---|---|---|
| committer | Cody Russell <bratsche@src.gnome.org> | 2008-08-22 00:31:59 +0000 |
| commit | f5b219d5ba0acb4fc29b9e661f62364b25787f05 (patch) | |
| tree | ec4351d0cbeabcfe41ef771ad7bbe08fd5252ecb | |
| parent | e767d7e37de04b7a1cd3cf5ddf1f3a157183c03e (diff) | |
| download | gtk+-f5b219d5ba0acb4fc29b9e661f62364b25787f05.tar.gz | |
Merged from trunk:
2008-08-21 Cody Russell <bratsche@gnome.org>
Merged from trunk:
* gdk/win32/gdkevents-win32.c (doesnt_want_key): Remove the checks
to see if the window is modally blocked. This doesn't get us anything,
and it confuses the search window in GtkTreeView (and potentially other
utility windows in other apps). (#520165)
svn path=/branches/gtk-2-12/; revision=21181
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 4 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2008-08-21 Cody Russell <bratsche@gnome.org> + + Merged from trunk: + + * gdk/win32/gdkevents-win32.c (doesnt_want_key): Remove the checks + to see if the window is modally blocked. This doesn't get us anything, + and it confuses the search window in GtkTreeView (and potentially other + utility windows in other apps). (#520165) + 2008-08-04 Sven Neumann <sven@gimp.org> Merged from trunk: diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 1d688f015a..6954692c62 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -1777,10 +1777,6 @@ doesnt_want_key (gint mask, { GdkWindow *modal_current = _gdk_modal_current (); GdkWindow *window = (GdkWindow *) gdk_win32_handle_table_lookup ((GdkNativeWindow)msg->hwnd); - gboolean modally_blocked = modal_current != NULL ? gdk_window_get_toplevel (window) != modal_current : FALSE; - - if (modally_blocked == TRUE) - return TRUE; return (((msg->message == WM_KEYUP || msg->message == WM_SYSKEYUP) && !(mask & GDK_KEY_RELEASE_MASK)) || |