reactivate commented out method

[wxWidgets.git] / src / osx / carbon / uma.cpp

diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp
index 3009393821d0d48ac349650f62ffa76b630f1d72..fd077da11327988badae674aea1ef585b81a4db9 100644 (file)
--- a/src/osx/carbon/uma.cpp
+++ b/src/osx/carbon/uma.cpp
@@ -79,7 +79,10 @@ void UMAInsertSubMenuItem( MenuRef menu , const wxString& title, wxFontEncoding
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     if ( !entry )
 void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     if ( !entry )

+    {
+        SetMenuItemCommandKey(menu, item, false, 0); 

         return ;
         return ;

+    }

 
     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;
 
     UInt8 modifiers = 0 ;
     SInt16 key = entry->GetKeyCode() ;


@@ -246,12 +249,12 @@ static OSStatus UMAGetHelpMenu(
                                bool             allowHelpMenuCreation)
 {
     static bool s_createdHelpMenu = false ;
                                bool             allowHelpMenuCreation)
 {
     static bool s_createdHelpMenu = false ;

-    
+

     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }
     if ( !s_createdHelpMenu && !allowHelpMenuCreation )
     {
         return paramErr ;
     }

-    
+

     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;
     OSStatus status = HMGetHelpMenu( outHelpMenu , outFirstCustomItemIndex ) ;
     s_createdHelpMenu = ( status == noErr ) ;
     return status ;