uppercasing menu shortcuts for non-command keystrokes, allowing non-command accelerators

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-06-01 07:27:22 +00:00
parent 547aafd263
commit 1bec2ee494

View File

@@ -318,7 +318,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
glyph += 13 ; glyph += 13 ;
if ( !explicitCommandKey ) if ( !explicitCommandKey )
modifiers |= kMenuNoCommandModifier ; modifiers |= kMenuNoCommandModifier ;
} }
else else
{ {
switch( key ) switch( key )
@@ -379,7 +379,14 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
macKey = kDownArrowCharCode ; macKey = kDownArrowCharCode ;
glyph = kMenuDownArrowGlyph ; glyph = kMenuDownArrowGlyph ;
break ; break ;
default :
macKey = toupper( key ) ;
break ;
} }
// we now allow non command key shortcuts
// remove in case this gives problems
if ( !explicitCommandKey )
modifiers |= kMenuNoCommandModifier ;
} }
// 1d and 1e have special meaning to SetItemCmd, so // 1d and 1e have special meaning to SetItemCmd, so