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

supporting more key equivalents for display, fixing setHidden: method warning

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-03-02 15:43:42 +00:00
parent 07776bef5f
commit 9c89493228
1 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,71 +145,59 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
{ {
switch ( key ) switch ( key )
{ {
/*
// standard function keys from here
case WXK_TAB :
modifiers |= NSFunctionKeyMask ;
shortcut = NSTabCharacter ;
break ;
case kEnterCharCode :
modifiers |= NSFunctionKeyMask ;
cocoaKey = NSTabCharacter ;
break ;
case WXK_RETURN :
modifiers |= NSFunctionKeyMask ;
cocoaKey = NSTabCharacter ;
break ;
case WXK_ESCAPE :
modifiers |= NSFunctionKeyMask ;
cocoaKey = kEscapeCharCode ;
break ;
case WXK_SPACE :
shortcut = ' ' ;
break ;
case WXK_CLEAR : case WXK_CLEAR :
cocoaKey = kClearCharCode ; modifiers |= NSFunctionKeyMask;
shortcut = NSDeleteCharacter ;
break ; break ;
case WXK_PAGEUP : case WXK_PAGEUP :
cocoaKey = kPageUpCharCode ; modifiers |= NSFunctionKeyMask;
shortcut = NSPageUpFunctionKey ;
break ; break ;
case WXK_PAGEDOWN : case WXK_PAGEDOWN :
cocoaKey = kPageDownCharCode ; modifiers |= NSFunctionKeyMask;
shortcut = NSPageDownFunctionKey ;
break ; break ;
case WXK_LEFT : case WXK_LEFT :
cocoaKey = kLeftArrowCharCode ; modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
shortcut = NSLeftArrowFunctionKey ;
break ; break ;
case WXK_UP : case WXK_UP :
cocoaKey = kUpArrowCharCode ; modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
shortcut = NSUpArrowFunctionKey ;
break ; break ;
case WXK_RIGHT : case WXK_RIGHT :
cocoaKey = kRightArrowCharCode ; modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
shortcut = NSRightArrowFunctionKey ;
break ; break ;
case WXK_DOWN : case WXK_DOWN :
cocoaKey = kDownArrowCharCode ; modifiers |= NSNumericPadKeyMask | NSFunctionKeyMask;
shortcut = NSDownArrowFunctionKey ;
break ; break ;
case WXK_HOME : case WXK_HOME :
cocoaKey = kHomeCharCode ; modifiers |= NSFunctionKeyMask;
shortcut = NSHomeFunctionKey ;
break ; break ;
case WXK_END : case WXK_END :
cocoaKey = kEndCharCode ; modifiers |= NSFunctionKeyMask;
shortcut = NSEndFunctionKey ;
break ; break ;
*/
// TODO Test all above with their function key equiv. case WXK_NUMPAD_ENTER :
// from NSEvent.h shortcut = NSEnterCharacter;
break;
case WXK_BACK :
case WXK_RETURN :
case WXK_TAB :
case WXK_ESCAPE :
default : default :
if(entry->GetFlags() & wxACCEL_SHIFT) if(entry->GetFlags() & wxACCEL_SHIFT)
shortcut = toupper(key); shortcut = toupper(key);
@@ -224,6 +212,10 @@ void wxMacCocoaMenuItemSetAccelerator( NSMenuItem* menuItem, wxAcceleratorEntry*
} }
} }
@interface NSMenuItem(PossibleMethods)
- (void)setHidden:(BOOL)hidden;
@end
class wxMenuItemCocoaImpl : public wxMenuItemImpl class wxMenuItemCocoaImpl : public wxMenuItemImpl
{ {
public : public :