fixed encoding handling in ANSI mode

[wxWidgets.git] / src / mac / carbon / menuitem.cpp

diff --git a/src/mac/carbon/menuitem.cpp b/src/mac/carbon/menuitem.cpp
index 544bfd6004d641d113b20d1450efac4635dac2f2..6c41427f76dfb0dbf25eec9dd28d9833561f7cf4 100644 (file)
--- a/src/mac/carbon/menuitem.cpp
+++ b/src/mac/carbon/menuitem.cpp
@@ -46,7 +46,7 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;
 {
        char *p = (char *) &outMacItemText[1] ;
        short macModifiers = 0 ;

-       char macShortCut = 0 ;
+       SInt16 macShortCut = 0 ;

        const char *inItemName ;
        wxString inItemTextMac ;
        
        const char *inItemName ;
        wxString inItemTextMac ;
        


@@ -72,31 +72,6 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
        {
                switch ( *inItemName )
                {
        {
                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 '&' :
                                {
                        // shortcuts
                        case '&' :
                                {


@@ -115,43 +90,71 @@ int wxMenuItem::MacBuildMenuString(StringPtr outMacItemText, SInt16 *outMacShort
                        case '\t' :
                                {
                                        ++inItemName ;
                        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;
                                                {
                                                        inItemName = inItemName + 5;

-                                                       macShortCut = *inItemName;
+                                                       explicitCommandKey = true ;

                                                }
                                                }

-                                               else if (strncmp("Cntrl", inItemName, 5) == 0) 
+                                               else if (wxStrnicmp("Cntrl", inItemName, 5) == 0) 

                                                {
                                                        inItemName = inItemName + 6;
                                                {
                                                        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 ;
                                                {
                                                        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 ;
                                                {
                                                        inItemName = inItemName + 6;
                                                        macModifiers |= kMenuShiftModifier ;

-                                                       macShortCut = *inItemName ;

                                                }
                                                }

-                                               else if (strncmp("F", inItemName, 1) == 0) 
+                                               else

                                                {
                                                {

-                                                       inItemName += strlen( inItemName ) ;
-                                                       // no function keys at the moment
-                                                       // macModifiers |= kMenuShiftModifier ;
-                                                       // macShortCut = *inItemName ;
+                                                   skip = true ;

                                                }
                                                }

-                                               else
+                                       }
+                                       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" ) )

                                                {
                                                {

-                                                       break ;
+                                                   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 ;
                                                
                                        if ( *inItemName == 0 )
                                                --inItemName ;