Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't add NSFunctionKeyMask to NSMenuItem modifiers.

Browse Source 
This code probably misunderstood NSEvent documentation, where this mask is
mentioned, but setKeyEquivalentModifierMask: documentation doesn't list it as
allowed. More importantly, it causes "fn" to appear in the menu item and the
accelerator doesn't work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75279 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-11-23 15:10:48 +00:00
parent 6005b1195c
commit 2f109ac2a9
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osx/cocoa/menuitem.mm
View File

@@ -153,7 +153,6 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
unichar shortcut = 0; unichar shortcut = 0;
if ( key >= WXK_F1 && key <= WXK_F15 ) if ( key >= WXK_F1 && key <= WXK_F15 )
{ {
modifiers |= NSFunctionKeyMask ;
shortcut = NSF1FunctionKey + ( key - WXK_F1 ); shortcut = NSF1FunctionKey + ( key - WXK_F1 );
} }
else else
@@ -161,47 +160,42 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
switch ( key ) switch ( key )
{ {
case WXK_CLEAR : case WXK_CLEAR :
modifiers |= NSFunctionKeyMask;
shortcut = NSDeleteCharacter ; shortcut = NSDeleteCharacter ;
break ; break ;
case WXK_PAGEUP : case WXK_PAGEUP :
modifiers |= NSFunctionKeyMask;
shortcut = NSPageUpFunctionKey ; shortcut = NSPageUpFunctionKey ;
break ; break ;
case WXK_PAGEDOWN : case WXK_PAGEDOWN :
modifiers |= NSFunctionKeyMask;
shortcut = NSPageDownFunctionKey ; shortcut = NSPageDownFunctionKey ;
break ; break ;
case WXK_LEFT : case WXK_LEFT :
modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask; modifiers |= NSNumericPadKeyMask;
shortcut = NSLeftArrowFunctionKey ; shortcut = NSLeftArrowFunctionKey ;
break ; break ;
case WXK_UP : case WXK_UP :
modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask; modifiers |= NSNumericPadKeyMask;
shortcut = NSUpArrowFunctionKey ; shortcut = NSUpArrowFunctionKey ;
break ; break ;
case WXK_RIGHT : case WXK_RIGHT :
modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask; modifiers |= NSNumericPadKeyMask;
shortcut = NSRightArrowFunctionKey ; shortcut = NSRightArrowFunctionKey ;
break ; break ;
case WXK_DOWN : case WXK_DOWN :
modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask; modifiers |= NSNumericPadKeyMask;
shortcut = NSDownArrowFunctionKey ; shortcut = NSDownArrowFunctionKey ;
break ; break ;
case WXK_HOME : case WXK_HOME :
modifiers |= NSFunctionKeyMask;
shortcut = NSHomeFunctionKey ; shortcut = NSHomeFunctionKey ;
break ; break ;
case WXK_END : case WXK_END :
modifiers |= NSFunctionKeyMask;
shortcut = NSEndFunctionKey ; shortcut = NSEndFunctionKey ;
break ; break ;