From 2f109ac2a905d900d49c3ea3ae9a9798ad2af902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 23 Nov 2013 15:10:48 +0000
Subject: [PATCH] Don't add NSFunctionKeyMask to NSMenuItem modifiers.

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
---
 src/osx/cocoa/menuitem.mm | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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