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

function key support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21468 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-06-28 06:59:30 +00:00
parent 31d20b589d
commit a5c1f8ca21
2 changed files with 8 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/mac/carbon/uma.cpp
View File

@@ -292,68 +292,15 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
SInt16 macKey = key ; SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 ) if ( key >= WXK_F1 && key <= WXK_F15 )
{ {
macKey = kFunctionKeyCharCode ; // for some reasons this must be 0 right now
// everything else leads to just the first function key item
// to be selected. Thanks to Ryan Wilcox for finding out.
macKey = 0 ;
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 ) if ( key >= WXK_F13 )
glyph += 13 ; glyph += 13 ;
if ( !explicitCommandKey ) if ( !explicitCommandKey )
modifiers |= kMenuNoCommandModifier ; modifiers |= kMenuNoCommandModifier ;
switch( key )
{
case WXK_F1 :
macKey += ( 0x7a << 8 ) ;
break ;
case WXK_F2 :
macKey += ( 0x78 << 8 ) ;
break ;
case WXK_F3 :
macKey += ( 0x63 << 8 ) ;
break ;
case WXK_F4 :
macKey += ( 0x76 << 8 ) ;
break ;
case WXK_F5 :
macKey += ( 0x60 << 8 ) ;
break ;
case WXK_F6 :
macKey += ( 0x61 << 8 ) ;
break ;
case WXK_F7 :
macKey += ( 0x62 << 8 ) ;
break ;
case WXK_F8 :
macKey += ( 0x64 << 8 ) ;
break ;
case WXK_F9 :
macKey += ( 0x65 << 8 ) ;
break ;
case WXK_F10 :
macKey += ( 0x6D << 8 ) ;
break ;
case WXK_F11 :
macKey += ( 0x67 << 8 ) ;
break ;
case WXK_F12 :
macKey += ( 0x6F << 8 ) ;
break ;
case WXK_F13 :
macKey += ( 0x69 << 8 ) ;
break ;
case WXK_F14 :
macKey += ( 0x6B << 8 ) ;
break ;
case WXK_F15 :
macKey += ( 0x71 << 8 ) ;
break ;
default :
break ;
} ;
// unfortunately this does not yet trigger the right key ,
// for some reason mac justs picks the first function key menu
// defined, so we turn this off
macKey = 0 ;
glyph = 0 ;
} }
else else
{ {

61
src/mac/uma.cpp
View File

@@ -292,68 +292,15 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
SInt16 macKey = key ; SInt16 macKey = key ;
if ( key >= WXK_F1 && key <= WXK_F15 ) if ( key >= WXK_F1 && key <= WXK_F15 )
{ {
macKey = kFunctionKeyCharCode ; // for some reasons this must be 0 right now
// everything else leads to just the first function key item
// to be selected. Thanks to Ryan Wilcox for finding out.
macKey = 0 ;
glyph = kMenuF1Glyph + ( key - WXK_F1 ) ; glyph = kMenuF1Glyph + ( key - WXK_F1 ) ;
if ( key >= WXK_F13 ) if ( key >= WXK_F13 )
glyph += 13 ; glyph += 13 ;
if ( !explicitCommandKey ) if ( !explicitCommandKey )
modifiers |= kMenuNoCommandModifier ; modifiers |= kMenuNoCommandModifier ;
switch( key )
{
case WXK_F1 :
macKey += ( 0x7a << 8 ) ;
break ;
case WXK_F2 :
macKey += ( 0x78 << 8 ) ;
break ;
case WXK_F3 :
macKey += ( 0x63 << 8 ) ;
break ;
case WXK_F4 :
macKey += ( 0x76 << 8 ) ;
break ;
case WXK_F5 :
macKey += ( 0x60 << 8 ) ;
break ;
case WXK_F6 :
macKey += ( 0x61 << 8 ) ;
break ;
case WXK_F7 :
macKey += ( 0x62 << 8 ) ;
break ;
case WXK_F8 :
macKey += ( 0x64 << 8 ) ;
break ;
case WXK_F9 :
macKey += ( 0x65 << 8 ) ;
break ;
case WXK_F10 :
macKey += ( 0x6D << 8 ) ;
break ;
case WXK_F11 :
macKey += ( 0x67 << 8 ) ;
break ;
case WXK_F12 :
macKey += ( 0x6F << 8 ) ;
break ;
case WXK_F13 :
macKey += ( 0x69 << 8 ) ;
break ;
case WXK_F14 :
macKey += ( 0x6B << 8 ) ;
break ;
case WXK_F15 :
macKey += ( 0x71 << 8 ) ;
break ;
default :
break ;
} ;
// unfortunately this does not yet trigger the right key ,
// for some reason mac justs picks the first function key menu
// defined, so we turn this off
macKey = 0 ;
glyph = 0 ;
} }
else else
{ {