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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
src/mac/carbon/menuitem.cpp
View File

@@ -46,7 +46,7 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
{
char *p = (char *) &outMacItemText[1] ;
short macModifiers = 0 ;
char macShortCut = 0 ;
SInt16 macShortCut = 0 ;
const char *inItemName ;
wxString inItemTextMac ;
@@ -72,31 +72,6 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
{
switch ( *inItemName )
{
// special characters for macintosh menus -> use some replacement
case ';' :
*p++ = ',' ;
break ;
case '^' :
*p++ = ' ' ;
break ;
case '!' :
*p++ = ' ' ;
break ;
case '<' :
*p++ = '[' ;
break ;
case '>' :
*p++ = ']' ;
break ;
case '/' :
*p++ = '|' ;
break ;
case '(' :
*p++ = '[' ;
break ;
case ')' :
*p++ = ']' ;
break ;
// shortcuts
case '&' :
{
@@ -115,43 +90,71 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
case '\t' :
{
++inItemName ;
while( *inItemName )
bool skip = false ;
bool explicitCommandKey = false ;
while( *inItemName && !skip )
{
if (strncmp("Ctrl", inItemName, 4) == 0)
if (wxStrnicmp("Ctrl", inItemName, 4) == 0)
{
inItemName = inItemName + 5;
macShortCut = *inItemName;
explicitCommandKey = true ;
}
else if (strncmp("Cntrl", inItemName, 5) == 0)
else if (wxStrnicmp("Cntrl", inItemName, 5) == 0)
{
inItemName = inItemName + 6;
macShortCut = *inItemName;
explicitCommandKey = true ;
}
else if (strncmp("Alt", inItemName, 3) == 0)
else if (wxStrnicmp("Alt", inItemName, 3) == 0)
{
inItemName = inItemName + 4;
macModifiers |= kMenuOptionModifier ;
macShortCut = *inItemName ;
}
else if (strncmp("Shift", inItemName, 5) == 0)
else if (wxStrnicmp("Shift", inItemName, 5) == 0)
{
inItemName = inItemName + 6;
macModifiers |= kMenuShiftModifier ;
macShortCut = *inItemName ;
}
else if (strncmp("F", inItemName, 1) == 0)
{
inItemName += strlen( inItemName ) ;
// no function keys at the moment
// macModifiers |= kMenuShiftModifier ;
// macShortCut = *inItemName ;
}
else
{
break ;
skip = true ;
}
}
if ( *inItemName )
{
if ( strlen(inItemName) == 1 )
{
macShortCut = *inItemName;
}
else if ( !wxStricmp( inItemName , "Delete" ) || !wxStricmp( inItemName , "Del" ) )
{
macShortCut = WXK_DELETE ;
}
else if ( !wxStricmp( inItemName , "Back" ) || !wxStricmp( inItemName , "Backspace" ) )
{
macShortCut = WXK_BACK ;
}
else if ( !wxStricmp( inItemName , "Return" ) )
{
macShortCut = WXK_RETURN ;
}
else if ( !wxStricmp( inItemName , "Enter" ) )
{
macShortCut = kEnterCharCode ;
}
else if ( *inItemName == 'F' )
{
int fkey = atol(inItemName+1) ;
if (fkey >= 1 && fkey < 15 )
{
macShortCut = WXK_F1 + fkey - 1 ;
}
if ( !explicitCommandKey )
macModifiers |= kMenuNoCommandModifier ;
}
}
inItemName += strlen( inItemName ) ;
if ( *inItemName == 0 )
--inItemName ;