X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a03b3e25a13196f4b1d4983072fc6ebe86e680d..cc44c7102fbab987280ad2dca7eb1e85ac70a9f6:/src/mac/carbon/uma.cpp

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 4dc05eedf3..ba57727478 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -9,7 +9,7 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#include "wx/defs.h"
+#include "wx/wxprec.h"
 
 #if wxUSE_GUI
 
@@ -36,7 +36,7 @@
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
-// the application so all wxWindows code can safely assume that appearance 1.1
+// the application so all wxWidgets code can safely assume that appearance 1.1
 // windows manager, control manager, navigation services etc. are
 // present
 
@@ -194,7 +194,7 @@ long UMAGetProcessMode()
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 
-    procno.highLongOfPSN = NULL ;
+    procno.highLongOfPSN = 0 ;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
@@ -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
@@ -397,6 +404,8 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
 {
     MacAppendMenu(menu, "\pA");
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) 
+    ChangeMenuItemAttributes( menu , ::CountMenuItems(menu), kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }
@@ -404,6 +413,8 @@ void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding enc
 void UMAInsertMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry )
 {
     MacInsertMenuItem( menu , "\pA" , item) ;
+    // don't attempt to interpret metacharacters like a '-' at the beginning (would become a separator otherwise) 
+    ChangeMenuItemAttributes( menu , item+1, kMenuItemAttrIgnoreMeta , 0 ) ;
     UMASetMenuItemText(menu, item+1 , title , encoding );
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }
@@ -636,22 +647,6 @@ OSErr UMASetKeyboardFocus                (WindowPtr                 inWindow,
     return err ;
 }
 
-// events
-void UMAUpdateControls( WindowPtr inWindow , RgnHandle inRgn )
-{
-    wxMacPortStateHelper help( (GrafPtr) GetWindowPort( (WindowRef) inWindow) ) ;
-    RgnHandle updateRgn = NewRgn() ;
-    GetWindowUpdateRgn( inWindow , updateRgn ) ;
-
-    Point zero = { 0 , 0 } ;
-    LocalToGlobal( &zero ) ;
-    OffsetRgn( updateRgn , -zero.h , -zero.v ) ;
-
-    UpdateControls( inWindow , inRgn ) ;
-    InvalWindowRgn( inWindow, updateRgn) ;
-    DisposeRgn( updateRgn ) ;
-}
-
 bool UMAIsWindowFloating( WindowRef inWindow )
 {
     WindowClass cl ;
@@ -801,15 +796,27 @@ Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
 #if TARGET_API_MAC_OSX
     if ( win != NULL && win->MacGetTopLevelWindow() != NULL )   
     {
-        int x , y ;
-        x = 0 ;
-        y = 0 ;
-        
-        win->GetParent()->MacWindowToRootWindow( &x , & y ) ;
-        bounds->left += x ;
-        bounds->right += x ;
-        bounds->top += y ;
-        bounds->bottom += y ;
+        wxWindow* parent = win->GetParent() ;
+        if ( parent )
+        {
+            // the parent controls 'origin' expressed in its own
+            // window coordinates (explanation in window.cpp)
+            int x , y ;
+            x = 0 ;
+            y = 0 ;
+            
+            if ( !parent->IsTopLevel() )
+            {
+                x += parent->MacGetLeftBorderSize() ;
+                y += parent->MacGetTopBorderSize() ;
+            }
+            
+            parent->MacWindowToRootWindow( &x , & y ) ;
+            bounds->left += x ;
+            bounds->right += x ;
+            bounds->top += y ;
+            bounds->bottom += y ;
+        }
     }
 #endif
     return bounds ;