X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63c6e6c80637791d4a290811108157a51c13f72d..bbd92d1dbea02db8c28e9c17bfacc0563d855b25:/src/mac/carbon/dnd.cpp diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index f5212eb4e2..961eb6da0f 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: dnd.cpp +// Name: src/mac/carbon/dnd.cpp // Purpose: wxDropTarget, wxDropSource implementations // Author: Stefan Csomor // Modified by: @@ -14,16 +14,14 @@ #if wxUSE_DRAG_AND_DROP #include "wx/dnd.h" -#include "wx/window.h" -#include "wx/toplevel.h" -#include "wx/app.h" -#include "wx/gdicmn.h" -#include "wx/mac/private.h" -#ifndef __DARWIN__ - #include -#endif +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/toplevel.h" + #include "wx/gdicmn.h" +#endif // WX_PRECOMP +#include "wx/mac/private.h" // ---------------------------------------------------------------------------- // globals @@ -31,15 +29,16 @@ typedef struct { - wxWindow* m_currentTargetWindow; - wxDropTarget* m_currentTarget; - wxDropSource* m_currentSource; -} -MacTrackingGlobals; + wxWindow *m_currentTargetWindow; + wxDropTarget *m_currentTarget; + wxDropSource *m_currentSource; + wxDragResult m_result; + int m_flags; +} MacTrackingGlobals; MacTrackingGlobals gTrackingGlobals; -void wxMacEnsureTrackingHandlersInstalled() ; +void wxMacEnsureTrackingHandlersInstalled(); //---------------------------------------------------------------------------- // wxDropTarget @@ -48,12 +47,12 @@ void wxMacEnsureTrackingHandlersInstalled() ; wxDropTarget::wxDropTarget( wxDataObject *data ) : wxDropTargetBase( data ) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); } -wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), - wxCoord WXUNUSED(y), - wxDragResult def ) +wxDragResult wxDropTarget::OnDragOver( + wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { return CurrentDragHasSupportedFormat() ? def : wxDragNone; } @@ -63,11 +62,12 @@ bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) if (m_dataObject == NULL) return false; - return CurrentDragHasSupportedFormat() ; + return CurrentDragHasSupportedFormat(); } -wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), - wxDragResult def ) +wxDragResult wxDropTarget::OnData( + wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), + wxDragResult def ) { if (m_dataObject == NULL) return wxDragNone; @@ -80,59 +80,44 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), bool wxDropTarget::CurrentDragHasSupportedFormat() { - bool supported = false ; + bool supported = false; + if (m_dataObject == NULL) + return false; if ( gTrackingGlobals.m_currentSource != NULL ) { - wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; + wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject(); if ( data ) { - size_t formatcount = data->GetFormatCount() ; + size_t formatcount = data->GetFormatCount(); wxDataFormat *array = new wxDataFormat[formatcount]; data->GetAllFormats( array ); - for (size_t i = 0; !supported && i < formatcount ; i++) + for (size_t i = 0; !supported && i < formatcount; i++) { - wxDataFormat format = array[i] ; + wxDataFormat format = array[i]; if ( m_dataObject->IsSupported( format ) ) { - supported = true ; - break ; + supported = true; + break; } } - delete [] array ; + delete [] array; } } if ( !supported ) { - UInt16 items ; - OSErr result; - ItemReference theItem; - FlavorType theType ; - UInt16 flavors = 0 ; - - CountDragItems( (DragReference)m_currentDrag, &items ); - for (UInt16 index = 1; index <= items && !supported; ++index) - { - flavors = 0 ; - GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem ); - CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors ); + PasteboardRef pasteboard; - for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) - { - result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); - if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) ) - { - supported = true ; - break ; - } - } + if ( GetDragPasteboard( (DragReference)m_currentDrag, &pasteboard ) == noErr ) + { + supported = m_dataObject->HasDataInPasteboard( pasteboard ); } } - return supported ; + return supported; } bool wxDropTarget::GetData() @@ -141,153 +126,55 @@ bool wxDropTarget::GetData() return false; if ( !CurrentDragHasSupportedFormat() ) - return false ; + return false; - bool transferred = false ; + bool transferred = false; if ( gTrackingGlobals.m_currentSource != NULL ) { - wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; + wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject(); - if ( data ) + if (data != NULL) { - size_t formatcount = data->GetFormatCount() ; + size_t formatcount = data->GetFormatCount(); wxDataFormat *array = new wxDataFormat[formatcount]; data->GetAllFormats( array ); - for (size_t i = 0; !transferred && i < formatcount ; i++) + for (size_t i = 0; !transferred && i < formatcount; i++) { - wxDataFormat format = array[i] ; + wxDataFormat format = array[i]; if ( m_dataObject->IsSupported( format ) ) { int size = data->GetDataSize( format ); - transferred = true ; + transferred = true; if (size == 0) { - m_dataObject->SetData( format , 0 , 0 ); + m_dataObject->SetData( format, 0, 0 ); } else { char *d = new char[size]; - data->GetDataHere( format , (void*) d ); - m_dataObject->SetData( format , size , d ) ; - delete [] d ; + data->GetDataHere( format, (void*)d ); + m_dataObject->SetData( format, size, d ); + delete [] d; } } } - delete [] array ; + delete [] array; } } if ( !transferred ) { - UInt16 items ; - OSErr result; - ItemReference theItem; - FlavorType theType ; - FlavorFlags theFlags; - UInt16 flavors ; - bool firstFileAdded = false ; - - CountDragItems( (DragReference)m_currentDrag, &items ); - for (UInt16 index = 1; index <= items; ++index) - { - flavors = 0 ; - GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem ); - CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ); - wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set ); - bool hasPreferredFormat = false ; - - for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) - { - result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); - wxDataFormat format( theType ); - if ( preferredFormat == format ) - { - hasPreferredFormat = true ; - break ; - } - } + PasteboardRef pasteboard; - for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) - { - result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType ); - wxDataFormat format( theType ) ; - if ( (hasPreferredFormat && format == preferredFormat) - || (!hasPreferredFormat && m_dataObject->IsSupportedFormat( format ))) - { - result = GetFlavorFlags( (DragReference)m_currentDrag, theItem, theType, &theFlags ); - if (result == noErr) - { - Size dataSize ; - Ptr theData ; - - GetFlavorDataSize( (DragReference)m_currentDrag, theItem, theType, &dataSize ); - if ( theType == kScrapFlavorTypeText ) - { - // this increment is only valid for allocating: - // on the next GetFlavorData call it is reset again to the original value - dataSize++ ; - } - else if ( theType == kScrapFlavorTypeUnicode ) - { - // this increment is only valid for allocating: - // on the next GetFlavorData call it is reset again to the original value - dataSize++ ; - dataSize++ ; - } - - theData = new char[dataSize]; - - GetFlavorData( (DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L ); - if ( theType == kScrapFlavorTypeText ) - { - theData[dataSize] = 0 ; - m_dataObject->SetData( wxDataFormat(wxDF_TEXT), dataSize , theData ); - } -#if wxUSE_UNICODE - else if ( theType == kScrapFlavorTypeUnicode ) - { - theData[dataSize + 0] = - theData[dataSize + 1] = 0 ; - m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData ); - } -#endif - else if ( theType == kDragFlavorTypeHFS ) - { - wxFileDataObject *fdo = dynamic_cast(m_dataObject); - wxASSERT( fdo != NULL ); - - if ((theData != NULL) && (fdo != NULL)) - { - HFSFlavor* theFile = (HFSFlavor*) theData ; - wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ; - - if ( !firstFileAdded ) - { - // reset file list - fdo->SetData( 0 , "" ) ; - firstFileAdded = true ; - } - - if (!name.IsEmpty()) - fdo->AddFile( name ) ; - } - } - else - { - m_dataObject->SetData( format, dataSize, theData ); - } - - delete [] theData; - } - break ; - } - } + if ( GetDragPasteboard( (DragReference)m_currentDrag, &pasteboard ) == noErr ) + { + transferred = m_dataObject->GetFromPasteboard( pasteboard ); } } - return true ; + return transferred; } //------------------------------------------------------------------------- @@ -303,7 +190,7 @@ wxDropSource::wxDropSource(wxWindow *win, const wxCursor &cursorStop) : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); m_window = win; } @@ -315,7 +202,7 @@ wxDropSource::wxDropSource(wxDataObject& data, const wxCursor &cursorStop) : wxDropSourceBase(cursorCopy, cursorMove, cursorStop) { - wxMacEnsureTrackingHandlersInstalled() ; + wxMacEnsureTrackingHandlersInstalled(); SetData( data ); m_window = win; @@ -325,142 +212,101 @@ wxDropSource::~wxDropSource() { } +OSStatus wxMacPromiseKeeper(PasteboardRef WXUNUSED(inPasteboard), + PasteboardItemID WXUNUSED(inItem), + CFStringRef WXUNUSED(inFlavorType), + void * WXUNUSED(inContext)) +{ + OSStatus err = noErr; + + // we might add promises here later, inContext is the wxDropSource* + + return err; +} + wxDragResult wxDropSource::DoDragDrop(int flags) { wxASSERT_MSG( m_data, wxT("Drop source: no data") ); - if (!m_data) - return (wxDragResult) wxDragNone; - if (m_data->GetFormatCount() == 0) - return (wxDragResult) wxDragNone; + if ((m_data == NULL) || (m_data->GetFormatCount() == 0)) + return (wxDragResult)wxDragNone; - OSErr result; DragReference theDrag; RgnHandle dragRegion; - if ((result = NewDrag(&theDrag)) != noErr) - return wxDragNone ; + OSStatus err = noErr; + PasteboardRef pasteboard; // add data to drag - size_t formatCount = m_data->GetFormatCount() ; - wxDataFormat *formats = new wxDataFormat[formatCount] ; - m_data->GetAllFormats( formats ) ; - ItemReference theItem = 1 ; - for ( size_t i = 0 ; i < formatCount ; ++i ) + err = PasteboardCreate( kPasteboardUniqueName, &pasteboard ); + if ( err != noErr ) + return wxDragNone; + + // we add a dummy promise keeper because of strange messages when linking against carbon debug + err = PasteboardSetPromiseKeeper( pasteboard, wxMacPromiseKeeper, this ); + if ( err != noErr ) { - size_t dataSize = m_data->GetDataSize( formats[i] ) ; - Ptr dataPtr = new char[dataSize] ; - m_data->GetDataHere( formats[i] , dataPtr ) ; - OSType type = formats[i].GetFormatId() ; - if ( type == 'TEXT' || type == 'utxt' ) - { - if ( dataSize > 0 ) - dataSize-- ; - dataPtr[ dataSize ] = 0 ; - if ( type == 'utxt' ) - { - if ( dataSize > 0 ) - dataSize-- ; - dataPtr[ dataSize ] = 0 ; - } + CFRelease( pasteboard ); + return wxDragNone; + } - AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 ); - } - else if (type == kDragFlavorTypeHFS ) - { - HFSFlavor theFlavor ; - OSErr err = noErr; - CInfoPBRec cat; - - wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec ) ; - - memset( &cat, 0, sizeof(cat) ); - cat.hFileInfo.ioNamePtr = theFlavor.fileSpec.name; - cat.hFileInfo.ioVRefNum = theFlavor.fileSpec.vRefNum; - cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID; - cat.hFileInfo.ioFDirIndex = 0; - err = PBGetCatInfoSync( &cat ); - if (err == noErr) - { - theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags; - if (theFlavor.fileSpec.parID == fsRtParID) - { - theFlavor.fileCreator = 'MACS'; - theFlavor.fileType = 'disk'; - } - else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) - { - theFlavor.fileCreator = 'MACS'; - theFlavor.fileType = 'fold'; - } - else - { - theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator; - theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType; - } + err = PasteboardClear( pasteboard ); + if ( err != noErr ) + { + CFRelease( pasteboard ); + return wxDragNone; + } + PasteboardSynchronize( pasteboard ); - AddDragItemFlavor( theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0 ); - } - } - else - { - AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 ); - } + m_data->AddToPasteboard( pasteboard, 1 ); - delete [] dataPtr ; + if (NewDragWithPasteboard( pasteboard , &theDrag) != noErr) + { + CFRelease( pasteboard ); + return wxDragNone; } - delete [] formats ; - dragRegion = NewRgn(); - RgnHandle tempRgn = NewRgn() ; - - EventRecord* ev = NULL ; + RgnHandle tempRgn = NewRgn(); -#if !TARGET_CARBON // TODO - ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ; -#else - { - EventRecord rec ; - ev = &rec ; - wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; - } -#endif + EventRecord rec; + ConvertEventRefToEventRecord( (EventRef) wxTheApp->MacGetCurrentEvent(), &rec ); - const short dragRegionOuterBoundary = 10 ; - const short dragRegionInnerBoundary = 9 ; + const short dragRegionOuterBoundary = 10; + const short dragRegionInnerBoundary = 9; SetRectRgn( - dragRegion , ev->where.h - dragRegionOuterBoundary , - ev->where.v - dragRegionOuterBoundary , - ev->where.h + dragRegionOuterBoundary , - ev->where.v + dragRegionOuterBoundary ) ; + dragRegion, + rec.where.h - dragRegionOuterBoundary, + rec.where.v - dragRegionOuterBoundary, + rec.where.h + dragRegionOuterBoundary, + rec.where.v + dragRegionOuterBoundary ); SetRectRgn( - tempRgn , ev->where.h - dragRegionInnerBoundary , - ev->where.v - dragRegionInnerBoundary , - ev->where.h + dragRegionInnerBoundary , - ev->where.v + dragRegionInnerBoundary ) ; + tempRgn, + rec.where.h - dragRegionInnerBoundary, + rec.where.v - dragRegionInnerBoundary, + rec.where.h + dragRegionInnerBoundary, + rec.where.v + dragRegionInnerBoundary ); - DiffRgn( dragRegion , tempRgn , dragRegion ) ; - DisposeRgn( tempRgn ) ; + DiffRgn( dragRegion, tempRgn, dragRegion ); + DisposeRgn( tempRgn ); // TODO: work with promises in order to return data // only when drag was successfully completed gTrackingGlobals.m_currentSource = this; - result = TrackDrag( theDrag, ev, dragRegion ); + gTrackingGlobals.m_result = wxDragNone; + gTrackingGlobals.m_flags = flags; + + err = TrackDrag( theDrag, &rec, dragRegion ); + DisposeRgn( dragRegion ); DisposeDrag( theDrag ); + CFRelease( pasteboard ); 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) @@ -474,7 +320,7 @@ bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) return result; } -bool gTrackingGlobalsInstalled = false ; +bool gTrackingGlobalsInstalled = false; // passing the globals via refcon is not needed by the CFM and later architectures anymore // but I'll leave it in there, just in case... @@ -490,13 +336,13 @@ void wxMacEnsureTrackingHandlersInstalled() { if ( !gTrackingGlobalsInstalled ) { - OSErr result; + OSStatus err; - result = InstallTrackingHandler( NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L, &gTrackingGlobals ); - wxASSERT( result == noErr ); + err = InstallTrackingHandler( NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L, &gTrackingGlobals ); + verify_noerr( err ); - result = InstallReceiveHandler( NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals ); - wxASSERT( result == noErr ); + err = InstallReceiveHandler( NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals ); + verify_noerr( err ); gTrackingGlobalsInstalled = true; } @@ -513,9 +359,9 @@ pascal OSErr wxMacWindowDragTrackingHandler( GetDragAttributes( theDrag, &attributes ); - wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; + wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ); - bool optionDown = GetCurrentKeyModifiers() & optionKey ; + bool optionDown = GetCurrentKeyModifiers() & optionKey; wxDragResult result = optionDown ? wxDragCopy : wxDragMove; switch (theMessage) @@ -527,8 +373,8 @@ pascal OSErr wxMacWindowDragTrackingHandler( case kDragTrackingEnterWindow: if (trackingGlobals != NULL) { - trackingGlobals->m_currentTargetWindow = NULL ; - trackingGlobals->m_currentTarget = NULL ; + trackingGlobals->m_currentTargetWindow = NULL; + trackingGlobals->m_currentTarget = NULL; } break; @@ -540,24 +386,23 @@ pascal OSErr wxMacWindowDragTrackingHandler( GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal( &localMouse ); + wxMacGlobalToLocal( theWindow, &localMouse ); { - wxWindow *win = NULL ; - ControlPartCode controlPart ; - ControlRef control = wxMacFindControlUnderMouse( - toplevel , localMouse , theWindow , &controlPart ) ; + wxWindow *win = NULL; + ControlPartCode controlPart; + ControlRef control = FindControlUnderMouse( localMouse, theWindow, &controlPart ); if ( control ) - win = wxFindControlFromMacControl( control ) ; + win = wxFindControlFromMacControl( control ); else - win = toplevel ; + win = toplevel; - int localx , localy ; - localx = localMouse.h ; - localy = localMouse.v ; + int localx, localy; + localx = localMouse.h; + localy = localMouse.v; if ( win ) - win->MacRootWindowToWindow( &localx , &localy ) ; + win->MacRootWindowToWindow( &localx, &localy ); if ( win != trackingGlobals->m_currentTargetWindow ) { if ( trackingGlobals->m_currentTargetWindow ) @@ -565,7 +410,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; @@ -576,26 +423,28 @@ pascal OSErr wxMacWindowDragTrackingHandler( if ( win ) { // this window is entered - trackingGlobals->m_currentTargetWindow = win ; - trackingGlobals->m_currentTarget = win->GetDropTarget() ; + trackingGlobals->m_currentTargetWindow = win; + trackingGlobals->m_currentTarget = win->GetDropTarget(); { if ( trackingGlobals->m_currentTarget ) { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - result = trackingGlobals->m_currentTarget->OnEnter( localx , localy , result ) ; + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + result = trackingGlobals->m_currentTarget->OnEnter( localx, localy, result ); } if ( result != wxDragNone ) { - int x , y ; - - x = y = 0 ; - win->MacWindowToRootWindow( &x , &y ) ; - RgnHandle hiliteRgn = NewRgn() ; - Rect r = { y , x , y + win->GetSize().y , x + win->GetSize().x } ; - RectRgn( hiliteRgn , &r ) ; + int x, y; + + x = y = 0; + win->MacWindowToRootWindow( &x, &y ); + RgnHandle hiliteRgn = NewRgn(); + Rect r = { y, x, y + win->GetSize().y, x + win->GetSize().x }; + RectRgn( hiliteRgn, &r ); +#ifndef __LP64__ ShowDragHilite( theDrag, hiliteRgn, true ); - DisposeRgn( hiliteRgn ) ; +#endif + DisposeRgn( hiliteRgn ); } } } @@ -604,8 +453,8 @@ pascal OSErr wxMacWindowDragTrackingHandler( { if ( trackingGlobals->m_currentTarget ) { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - trackingGlobals->m_currentTarget->OnDragOver( localx , localy , result ) ; + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + result = trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result ); } } @@ -614,28 +463,21 @@ pascal OSErr wxMacWindowDragTrackingHandler( { if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) ) { - switch ( result ) + int cursorID = wxCURSOR_NONE; + + switch (result) { - case wxDragCopy : - { - wxCursor cursor(wxCURSOR_COPY_ARROW) ; - cursor.MacInstall() ; - } - break ; - - case wxDragMove : - { - wxCursor cursor(wxCURSOR_ARROW) ; - cursor.MacInstall() ; - } - break ; - - case wxDragNone : - { - wxCursor cursor(wxCURSOR_NO_ENTRY) ; - cursor.MacInstall() ; - } - break ; + case wxDragCopy: + cursorID = wxCURSOR_COPY_ARROW; + break; + + case wxDragMove: + cursorID = wxCURSOR_ARROW; + break; + + case wxDragNone: + cursorID = wxCURSOR_NO_ENTRY; + break; case wxDragError: case wxDragLink: @@ -644,6 +486,12 @@ pascal OSErr wxMacWindowDragTrackingHandler( // put these here to make gcc happy ; } + + if (cursorID != wxCURSOR_NONE) + { + wxCursor cursor( cursorID ); + cursor.MacInstall(); + } } } } @@ -657,7 +505,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; @@ -678,28 +528,35 @@ pascal OSErr wxMacWindowDragReceiveHandler( MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*)handlerRefCon; if ( trackingGlobals->m_currentTarget ) { - Point mouse, localMouse ; - int localx, localy ; + Point mouse, localMouse; + int localx, localy; - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - GetDragMouse(theDrag, &mouse, 0L); + trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ); + GetDragMouse( theDrag, &mouse, 0L ); localMouse = mouse; - GlobalToLocal(&localMouse); - localx = localMouse.h ; - localy = localMouse.v ; + wxMacGlobalToLocal( theWindow, &localMouse ); + localx = localMouse.h; + localy = localMouse.v; // TODO : should we use client coordinates? if ( trackingGlobals->m_currentTargetWindow ) - trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ; - if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) ) + 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 +