diff options
| author | Tor Lillqvist <tml@iki.fi> | 2002-09-24 21:53:19 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2002-09-24 21:53:19 +0000 |
| commit | e53e9652a52e468586df2ebdb03f51df781e9499 (patch) | |
| tree | 3ed652cf0caa92a99938c2fc4fc057d31b3a7f0b /gdk/win32 | |
| parent | beb31ce0f002a52833a33a0175a505d22c089438 (diff) | |
| download | gtk+-e53e9652a52e468586df2ebdb03f51df781e9499.tar.gz | |
Merge from gtk-2-0:
2002-09-25 Tor Lillqvist <tml@iki.fi>
* gdk/win32/gdkevents-win32.c (gdk_event_translate):
WM_SYSKEYDOWN, WM_SYSKEYUP: Need to handle F10 specially here in
order to be able to handle it normally in the application. Set
ignore_wm_char also always when handling WM_SYSKEY{DOWN,UP}, this
way we can generate GDK events also for Alt-Fn keys, for instance.
Diffstat (limited to 'gdk/win32')
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 327577364c..d7cd076f37 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -2178,7 +2178,7 @@ gdk_event_translate (GdkDisplay *display, decode_key_lparam (msg->lParam))); /* If posted without us having keyboard focus, ignore */ - if (!(msg->lParam & 0x20000000)) + if (msg->wParam != VK_F10 && !(HIWORD (msg->lParam) & KF_ALTDOWN)) break; /* Let the system handle Alt-Tab, Alt-Enter and Alt-F4 */ @@ -2209,10 +2209,10 @@ gdk_event_translate (GdkDisplay *display, msg->wParam, decode_key_lparam (msg->lParam))); - ignore_wm_char = TRUE; - keyup_or_down: + ignore_wm_char = TRUE; + event->key.window = window; switch (msg->wParam) @@ -2458,7 +2458,7 @@ gdk_event_translate (GdkDisplay *display, if (!propagate (&window, msg, k_grab_window, k_grab_owner_events, GDK_ALL_EVENTS_MASK, doesnt_want_key)) - break; + break; ASSIGN_WINDOW (window); is_altgr_key = FALSE; |