diff options
| -rw-r--r-- | include/ui/gtk.h | 4 | ||||
| -rw-r--r-- | ui/gtk.c | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index ee6dffd306..0359333fce 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -1,10 +1,6 @@ #ifndef UI_GTK_H #define UI_GTK_H -#ifdef _WIN32 -# define _WIN32_WINNT 0x0601 /* needed to get definition of MAPVK_VK_TO_VSC */ -#endif - #ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE /* Work around an -Wstrict-prototypes warning in GTK headers */ #pragma GCC diagnostic push diff --git a/ui/gtk.c b/ui/gtk.c index 187de74b2c..3057cdc3f7 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -104,6 +104,15 @@ #define GDK_KEY_Pause GDK_Pause #endif +/* Some older mingw versions lack this constant or have + * it conditionally defined */ +#ifdef _WIN32 +# ifndef MAPVK_VK_TO_VSC +# define MAPVK_VK_TO_VSC 0 +# endif +#endif + + #define HOTKEY_MODIFIERS (GDK_CONTROL_MASK | GDK_MOD1_MASK) static const int modifier_keycode[] = { |