correcting DropData behaviour so that preferred format is handled correctly

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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 7e8542e4d5746bdd01f06df88d1c98c4be6c4f17..8588e8526052e581e5bdb8327e7e3fb20591af61 100644 (file)
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -9,14 +9,14 @@
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     The wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#include "wx/defs.h"
+#include "wx/wxprec.h"

 
 #if wxUSE_GUI
 
 #include "wx/dc.h"
 
 #if wxUSE_GUI
 
 #include "wx/dc.h"

-#include <MacTextEditor.h>

 
 #ifndef __DARWIN__
 
 #ifndef __DARWIN__

+#  include <MacTextEditor.h>

 #  include <Navigation.h>
 #  if defined(TARGET_CARBON)
 #    if PM_USE_SESSION_APIS
 #  include <Navigation.h>
 #  if defined(TARGET_CARBON)
 #    if PM_USE_SESSION_APIS


@@ -33,6 +33,9 @@
 #endif
 #include "wx/mac/uma.h"
 
 #endif
 #include "wx/mac/uma.h"
 

+#if TARGET_API_MAC_OSX
+#include "wx/toplevel.h"
+#endif

 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of
 
 // since we have decided that we only support 8.6 upwards we are
 // checking for these minimum requirements in the startup code of


@@ -194,7 +197,7 @@ long UMAGetProcessMode()
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 
     ProcessInfoRec processinfo;
     ProcessSerialNumber procno ;
 

-    procno.highLongOfPSN = NULL ;
+    procno.highLongOfPSN = 0 ;

     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;
     procno.lowLongOfPSN = kCurrentProcess ;
     processinfo.processInfoLength = sizeof(ProcessInfoRec);
     processinfo.processName = NULL;


@@ -318,7 +321,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 +382,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


@@ -397,6 +407,8 @@ void UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEn
 void UMAAppendMenuItem( MenuRef menu , const wxString& title, wxFontEncoding encoding , wxAcceleratorEntry *entry )
 {
     MacAppendMenu(menu, "\pA");
 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 ) ;
 }
     UMASetMenuItemText(menu, (SInt16) ::CountMenuItems(menu), title , encoding );
     UMASetMenuItemShortcut( menu ,  (SInt16) ::CountMenuItems(menu), entry ) ;
 }


@@ -404,6 +416,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) ;
 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 ) ;
 }
     UMASetMenuItemText(menu, item+1 , title , encoding );
     UMASetMenuItemShortcut( menu , item+1 , entry ) ;
 }


@@ -659,7 +673,7 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
     if ( inWindowRef )
     {
 //        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;
     if ( inWindowRef )
     {
 //        bool isHighlighted = IsWindowHighlited( inWindowRef ) ;

-//        if ( inActivate != isHightlited )
+//        if ( inActivate != isHighlighted )

         GrafPtr port ;
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;
         GrafPtr port ;
         GetPort( &port ) ;
         SetPortWindowPort( inWindowRef ) ;


@@ -779,21 +793,17 @@ OSStatus UMAPutScrap( Size size , OSType type , void *data )
 
 Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
 {
 
 Rect* UMAGetControlBoundsInWindowCoords(ControlRef theControl, Rect *bounds)
 {

-    wxWindow* win = wxFindControlFromMacControl( theControl ) ;
-    

     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX
     GetControlBounds( theControl , bounds ) ;
 #if TARGET_API_MAC_OSX

-    if ( win != NULL && win->MacGetTopLevelWindow() != NULL )   
+    WindowRef tlwref = GetControlOwner( theControl ) ;
+
+    wxTopLevelWindowMac* tlwwx = wxFindWinFromMacWindow( tlwref ) ;
+    if ( tlwwx != NULL && tlwwx->MacUsesCompositing() )

     {
     {

-        int x , y ;
-        x = 0 ;
-        y = 0 ;
-        
-        win->GetParent()->MacWindowToRootWindow( &x , & y ) ;
-        bounds->left += x ;
-        bounds->right += x ;
-        bounds->top += y ;
-        bounds->bottom += y ;
+        ControlRef rootControl = tlwwx->GetPeer()->GetControlRef() ;
+        HIPoint hiPoint = CGPointMake(  0 , 0 ) ;
+        HIViewConvertPoint( &hiPoint , HIViewGetSuperview(theControl) , rootControl  ) ;
+        OffsetRect( bounds , (short) hiPoint.x , (short) hiPoint.y ) ;

     }
 #endif
     return bounds ;
     }
 #endif
     return bounds ;