From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 1 Jun 2004 07:27:22 +0000 (+0000)
Subject: uppercasing menu shortcuts for non-command keystrokes, allowing non-command accelerators
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1bec2ee494cff7088b1b131d8dc1c6a4ebebd217

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 7e8542e4d5..06922510a1 100644
--- 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 ;
-          }
+        }
         else
         {
             switch( key )
@@ -379,7 +379,14 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
                     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