Skip to content

Commit d4f5ee7

Browse files
Merge pull request #1482 from AnyOldName3/msys2-fixes
Add preprocessor guard for Windows virtual keycodes
2 parents 7093200 + 8fbf792 commit d4f5ee7

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

src/vsg/platform/win32/Win32_Window.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ KeyboardMap::KeyboardMap()
221221
{VK_F22 , KEY_F22},
222222
{VK_F23 , KEY_F23},
223223
{VK_F24 , KEY_F24},
224+
#if _WIN32_WINNT >= 0x0604
224225
{VK_NAVIGATION_VIEW , KEY_Undefined}, // reserved
225226
{VK_NAVIGATION_MENU , KEY_Undefined}, // reserved
226227
{VK_NAVIGATION_UP , KEY_Undefined}, // reserved
@@ -229,6 +230,7 @@ KeyboardMap::KeyboardMap()
229230
{VK_NAVIGATION_RIGHT , KEY_Undefined}, // reserved
230231
{VK_NAVIGATION_ACCEPT , KEY_Undefined}, // reserved
231232
{VK_NAVIGATION_CANCEL , KEY_Undefined}, // reserved
233+
#endif
232234
{VK_NUMLOCK , KEY_Undefined},
233235
{VK_SCROLL , KEY_Scroll_Lock},
234236
{VK_LSHIFT , KEY_Shift_L},
@@ -262,6 +264,7 @@ KeyboardMap::KeyboardMap()
262264
{VK_OEM_PERIOD , KEY_Period }, // '.' any country
263265
{VK_OEM_2 , KEY_Slash }, // '/?' for US
264266
{VK_OEM_3 , KEY_Tilde }, // '`~' for US
267+
#if _WIN32_WINNT >= 0x0604
265268
{VK_GAMEPAD_A , KEY_Undefined},
266269
{VK_GAMEPAD_B , KEY_Undefined},
267270
{VK_GAMEPAD_X , KEY_Undefined},
@@ -286,6 +289,7 @@ KeyboardMap::KeyboardMap()
286289
{VK_GAMEPAD_RIGHT_THUMBSTICK_DOWN , KEY_Undefined},
287290
{VK_GAMEPAD_RIGHT_THUMBSTICK_RIGHT , KEY_Undefined},
288291
{VK_GAMEPAD_RIGHT_THUMBSTICK_LEFT , KEY_Undefined},
292+
#endif
289293
{VK_OEM_4 , KEY_Leftbracket}, // '[{' for US
290294
{VK_OEM_5 , KEY_Backslash}, // '\|' for US
291295
{VK_OEM_6 , KEY_Rightbracket}, // ']}' for US

0 commit comments

Comments
 (0)