Menu label consistency changes

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

diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp
index 834533d04a4ca38ea013901710d079215d113364..6f5a325730d958ad9d86d8e4b46e8fbfeac7f4ac 100644 (file)
--- a/src/mac/carbon/dnd.cpp
+++ b/src/mac/carbon/dnd.cpp
@@ -17,7 +17,6 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
-    #include "wx/window.h"
     #include "wx/toplevel.h"
     #include "wx/gdicmn.h"
 #endif // WX_PRECOMP
@@ -38,8 +37,9 @@ typedef struct
     wxWindow *m_currentTargetWindow;
     wxDropTarget *m_currentTarget;
     wxDropSource *m_currentSource;
-}
-MacTrackingGlobals;
+    wxDragResult m_result;
+    int m_flags;
+} MacTrackingGlobals;
 
 MacTrackingGlobals gTrackingGlobals;
 
@@ -113,7 +113,6 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
     if ( !supported )
     {
         UInt16 items;
-        OSErr result;
         ItemReference theItem;
         FlavorType theType;
         UInt16 flavors = 0;
@@ -127,7 +126,7 @@ bool wxDropTarget::CurrentDragHasSupportedFormat()
 
             for ( UInt16 flavor = 1; flavor <= flavors; ++flavor )
             {
-                result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
+                GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
                 if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
                 {
                     supported = true;
@@ -267,10 +266,12 @@ bool wxDropTarget::GetData()
                             if (theData != NULL)
                             {
                                 HFSFlavor* theFile = (HFSFlavor*)theData;
+#ifndef __LP64__
                                 wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec );
 
                                 if (!name.empty())
                                     filenamesPassed += name + wxT("\n");
+#endif
                             }
                             break;
 
@@ -338,18 +339,17 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     if ((m_data == NULL) || (m_data->GetFormatCount() == 0))
         return (wxDragResult)wxDragNone;
 
-    OSStatus result;
     DragReference theDrag;
     RgnHandle dragRegion;
 
-    if ((result = NewDrag( &theDrag )) != noErr)
+    if (NewDrag( &theDrag ) != noErr)
         return wxDragNone;
 
     // add data to drag
     size_t formatCount = m_data->GetFormatCount();
     wxDataFormat *formats = new wxDataFormat[formatCount];
     m_data->GetAllFormats( formats );
-    ItemReference theItem = 1;
+    ItemReference theItem = (ItemReference) 1;
 
     for ( size_t i = 0; i < formatCount; ++i )
     {
@@ -375,6 +375,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
         {
             HFSFlavor  theFlavor;
             OSErr err = noErr;
+#ifndef __LP64__
             CInfoPBRec cat;
 
             wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec );
@@ -385,8 +386,10 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
             cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID;
             cat.hFileInfo.ioFDirIndex = 0;
             err = PBGetCatInfoSync( &cat );
-            if (err == noErr)
+#endif
+          if (err == noErr)
             {
+#ifndef __LP64__
                 theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags;
                 if (theFlavor.fileSpec.parID == fsRtParID)
                 {
@@ -403,7 +406,7 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
                     theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator;
                     theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType;
                 }
-
+#endif
                 AddDragItemFlavor( theDrag, theItem, type, &theFlavor, sizeof(theFlavor), 0 );
             }
         }
@@ -454,18 +457,15 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
     // only when drag was successfully completed
 
     gTrackingGlobals.m_currentSource = this;
-    result = TrackDrag( theDrag, ev, dragRegion );
+    gTrackingGlobals.m_result = wxDragNone;
+    gTrackingGlobals.m_flags = flags;
+
+    TrackDrag( theDrag, ev, dragRegion );
     DisposeRgn( dragRegion );
     DisposeDrag( theDrag );
     gTrackingGlobals.m_currentSource = NULL;
 
-    bool optionDown = GetCurrentKeyModifiers() & optionKey;
-    wxDragResult dndresult = wxDragCopy;
-    if ( flags != wxDrag_CopyOnly )
-        // on mac the option key is always the indication for copy
-        dndresult = optionDown ? wxDragCopy : wxDragMove;
-
-    return dndresult;
+    return gTrackingGlobals.m_result;
 }
 
 bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
@@ -545,7 +545,7 @@ pascal OSErr wxMacWindowDragTrackingHandler(
 
             GetDragMouse( theDrag, &mouse, 0L );
             localMouse = mouse;
-            GlobalToLocal( &localMouse );
+            wxMacGlobalToLocal( theWindow, &localMouse );
 
             {
                 wxWindow *win = NULL;
@@ -570,7 +570,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
                         // this window is left
                         if ( trackingGlobals->m_currentTarget )
                         {
+#ifndef __LP64__
                             HideDragHilite( theDrag );
+#endif
                             trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
                             trackingGlobals->m_currentTarget->OnLeave();
                             trackingGlobals->m_currentTarget = NULL;
@@ -599,7 +601,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
                                 RgnHandle hiliteRgn = NewRgn();
                                 Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x };
                                 RectRgn( hiliteRgn, &r );
+#ifndef __LP64__
                                 ShowDragHilite( theDrag, hiliteRgn, true );
+#endif
                                 DisposeRgn( hiliteRgn );
                             }
                         }
@@ -661,7 +665,9 @@ pascal OSErr wxMacWindowDragTrackingHandler(
             {
                 trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
                 trackingGlobals->m_currentTarget->OnLeave();
+#ifndef __LP64__
                 HideDragHilite( theDrag );
+#endif
                 trackingGlobals->m_currentTarget = NULL;
             }
             trackingGlobals->m_currentTargetWindow = NULL;
@@ -688,7 +694,7 @@ pascal OSErr wxMacWindowDragReceiveHandler(
         trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
         GetDragMouse( theDrag, &mouse, 0L );
         localMouse = mouse;
-        GlobalToLocal( &localMouse );
+        wxMacGlobalToLocal( theWindow, &localMouse );
         localx = localMouse.h;
         localy = localMouse.v;
 
@@ -697,13 +703,20 @@ pascal OSErr wxMacWindowDragReceiveHandler(
             trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx, &localy );
         if ( trackingGlobals->m_currentTarget->OnDrop( localx, localy ) )
         {
-            bool optionDown = GetCurrentKeyModifiers() & optionKey;
-            wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
-            trackingGlobals->m_currentTarget->OnData( localx, localy, result );
+            // the option key indicates copy in Mac UI, if it's not pressed do
+            // move by default if it's allowed at all
+            wxDragResult
+                result = !(trackingGlobals->m_flags & wxDrag_AllowMove) ||
+                            (GetCurrentKeyModifiers() & optionKey)
+                            ? wxDragCopy
+                            : wxDragMove;
+            trackingGlobals->m_result =
+                trackingGlobals->m_currentTarget->OnData( localx, localy, result );
         }
     }
 
     return noErr;
 }
 
-#endif
+#endif // wxUSE_DRAG_AND_DROP
+