From f2aeb35d0c626945732a7a8af148b8d5150cc00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 23 Nov 2013 15:09:55 +0000 Subject: [PATCH] Differentiate between WXK_UP etc. and WXK_NUMPAD_ variants in NSMenuItem code. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75277 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/cocoa/menuitem.mm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/osx/cocoa/menuitem.mm b/src/osx/cocoa/menuitem.mm index febbc43d28..578fcefd8e 100644 --- a/src/osx/cocoa/menuitem.mm +++ b/src/osx/cocoa/menuitem.mm @@ -171,23 +171,31 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry* shortcut = NSPageDownFunctionKey ; break ; - case WXK_LEFT : + case WXK_NUMPAD_LEFT : modifiers |= NSNumericPadKeyMask; + // pass through + case WXK_LEFT : shortcut = NSLeftArrowFunctionKey ; break ; - case WXK_UP : + case WXK_NUMPAD_UP : modifiers |= NSNumericPadKeyMask; + // pass through + case WXK_UP : shortcut = NSUpArrowFunctionKey ; break ; - case WXK_RIGHT : + case WXK_NUMPAD_RIGHT : modifiers |= NSNumericPadKeyMask; + // pass through + case WXK_RIGHT : shortcut = NSRightArrowFunctionKey ; break ; - case WXK_DOWN : + case WXK_NUMPAD_DOWN : modifiers |= NSNumericPadKeyMask; + // pass through + case WXK_DOWN : shortcut = NSDownArrowFunctionKey ; break ;