diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-04-06 15:13:00 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-04-06 15:13:00 -0400 |
| commit | 25e9a549029bdca60a7204e14794089b8c72bd8a (patch) | |
| tree | d584d33fcba683f463134eda42498a1529f11126 | |
| parent | 7fa103717d131ced91905bbfed0ba7d960b1c166 (diff) | |
| download | gtk+-25e9a549029bdca60a7204e14794089b8c72bd8a.tar.gz | |
win32: Stop using MODx modifiers
The win32 backend is using GDK_MOD2_MASK for AltGr,
so define GDK_MOD2_MASK locally to keep this working,
but remove any mention of GDK_MOD3_MASK,...,GDK_MOD5_MASK.
| -rw-r--r-- | gdk/win32/gdkevents-win32.c | 5 | ||||
| -rw-r--r-- | gdk/win32/gdkkeys-win32.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index fb2867ec83..4dca31ce36 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -72,6 +72,8 @@ #include <imm.h> +#define GDK_MOD2_MASK (1 << 4) + #ifndef XBUTTON1 #define XBUTTON1 1 #define XBUTTON2 2 @@ -743,9 +745,6 @@ print_event_state (guint state) CASE (CONTROL); CASE (ALT); CASE (MOD2); - CASE (MOD3); - CASE (MOD4); - CASE (MOD5); CASE (BUTTON1); CASE (BUTTON2); CASE (BUTTON3); diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index 9350c121f5..3183168bdc 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -38,6 +38,8 @@ #include "gdkkeysprivate.h" #include "gdkwin32keys.h" +#define GDK_MOD2_MASK (1 << 4) + enum _GdkWin32KeyLevelState { GDK_WIN32_LEVEL_NONE = 0, |