use correct scale when drawing

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

diff --git a/src/osx/carbon/uma.cpp b/src/osx/carbon/uma.cpp
index 8606c1196f6afe4d79bc83d8ef8e81b76236e821..a89ca35d15d6a925c982f14d19959a1cf2dbf56b 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() ;


@@ -93,6 +96,9 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
         if (entry->GetFlags() & wxACCEL_SHIFT)
             modifiers |= kMenuShiftModifier ;
 
         if (entry->GetFlags() & wxACCEL_SHIFT)
             modifiers |= kMenuShiftModifier ;
 

+        if (entry->GetFlags() & wxACCEL_RAW_CTRL)
+            modifiers |= kMenuControlModifier ;
+        

         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )
         SInt16 glyph = 0 ;
         SInt16 macKey = key ;
         if ( key >= WXK_F1 && key <= WXK_F15 )