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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 7e8542e4d5746bdd01f06df88d1c98c4be6c4f17..06922510a19cdc2dbf2ca7fc8bbe23181484896e 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -318,7 +318,7 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
                 glyph += 13 ;
             if ( !explicitCommandKey )
                 modifiers |= kMenuNoCommandModifier ;
                 glyph += 13 ;
             if ( !explicitCommandKey )
                 modifiers |= kMenuNoCommandModifier ;

-          }
+        }

         else
         {
             switch( key )
         else
         {
             switch( key )


@@ -379,7 +379,14 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     break ;
                     macKey = kDownArrowCharCode ;
                     glyph = kMenuDownArrowGlyph ;
                     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