X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/427ff66291af2d8dd34ff5ee68c81436997144a1..93a2b888fcbc81aa1c97df976ff0b151b2233abd:/src/mac/carbon/dnd.cpp?ds=sidebyside diff --git a/src/mac/carbon/dnd.cpp b/src/mac/carbon/dnd.cpp index d4eb35abba..c1cf629872 100644 --- a/src/mac/carbon/dnd.cpp +++ b/src/mac/carbon/dnd.cpp @@ -1,6 +1,6 @@ /////////////////////////////////////////////////////////////////////////////// // Name: dnd.cpp -// Purpose: wxDropTarget, wxDropSource, wxDataObject implementation +// Purpose: wxDropTarget, wxDropSource implementations // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 @@ -9,11 +9,7 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dnd.h" -#endif - -#include "wx/defs.h" +#include "wx/wxprec.h" #if wxUSE_DRAG_AND_DROP @@ -24,20 +20,25 @@ #include "wx/gdicmn.h" #include "wx/mac/private.h" +#ifndef __DARWIN__ + #include +#endif + // ---------------------------------------------------------------------------- -// global +// globals // ---------------------------------------------------------------------------- -void wxMacEnsureTrackingHandlersInstalled() ; - -typedef struct +typedef struct { wxWindow* m_currentTargetWindow ; wxDropTarget* m_currentTarget ; wxDropSource* m_currentSource ; -} MacTrackingGlobals ; +} +MacTrackingGlobals ; -MacTrackingGlobals gTrackingGlobals ; +MacTrackingGlobals gTrackingGlobals ; + +void wxMacEnsureTrackingHandlersInstalled() ; //---------------------------------------------------------------------------- // wxDropTarget @@ -53,14 +54,13 @@ wxDragResult wxDropTarget::OnDragOver( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def ) { - return CurrentDragHasSupportedFormat() ? def : wxDragNone; } bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) ) { if (!m_dataObject) - return FALSE; + return false; return CurrentDragHasSupportedFormat() ; } @@ -77,13 +77,13 @@ wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), return GetData() ? def : wxDragNone; } -bool wxDropTarget::CurrentDragHasSupportedFormat() +bool wxDropTarget::CurrentDragHasSupportedFormat() { bool supported = false ; if ( gTrackingGlobals.m_currentSource != NULL ) { wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; - + if ( data ) { size_t formatcount = data->GetFormatCount() ; @@ -92,27 +92,32 @@ bool wxDropTarget::CurrentDragHasSupportedFormat() for (size_t i = 0; !supported && i < formatcount ; i++) { wxDataFormat format = array[i] ; - if ( m_dataObject->IsSupported( format ) ) + if ( m_dataObject->IsSupported( format ) ) { 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 == false ; ++index) + for (UInt16 index = 1; index <= items && !supported ; ++index) { - ItemReference theItem; - FlavorType theType ; - UInt16 flavors = 0 ; + flavors = 0 ; GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem); CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ; + for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) { result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType); @@ -124,36 +129,37 @@ bool wxDropTarget::CurrentDragHasSupportedFormat() } } } - return supported ; + + return supported ; } bool wxDropTarget::GetData() { if (!m_dataObject) - return FALSE; - + return false; + if ( !CurrentDragHasSupportedFormat() ) - return FALSE ; - - bool transferred = false ; + return false ; + + bool transferred = false ; if ( gTrackingGlobals.m_currentSource != NULL ) { wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ; - + if ( data ) { size_t formatcount = data->GetFormatCount() ; - wxDataFormat *array = new wxDataFormat[ formatcount ]; + wxDataFormat *array = new wxDataFormat[formatcount]; data->GetAllFormats( array ); for (size_t i = 0; !transferred && i < formatcount ; i++) { wxDataFormat format = array[i] ; - if ( m_dataObject->IsSupported( format ) ) + if ( m_dataObject->IsSupported( format ) ) { int size = data->GetDataSize( format ); transferred = true ; - - if (size == 0) + + if (size == 0) { m_dataObject->SetData(format , 0 , 0 ) ; } @@ -162,77 +168,114 @@ bool wxDropTarget::GetData() char *d = new char[size]; data->GetDataHere( format , (void*) d ); m_dataObject->SetData( format , size , d ) ; - delete[] 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) + for (UInt16 index = 1; index <= items; ++index) { - ItemReference theItem; - FlavorType theType ; - UInt16 flavors = 0 ; + flavors = 0 ; GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem); CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ; + bool hasPreferredFormat = false ; + wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set ) ; + + for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) + { + result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType); + wxDataFormat format(theType) ; + if ( preferredFormat == format ) + { + hasPreferredFormat = true ; + break ; + } + } + for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor ) { result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType); wxDataFormat format(theType) ; - if ( m_dataObject->IsSupportedFormat( format ) ) + if ( (hasPreferredFormat && format == preferredFormat) || (!hasPreferredFormat && m_dataObject->IsSupportedFormat( format ))) { - FlavorFlags theFlags; result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags); - if (result == noErr) + if (result == noErr) { Size dataSize ; Ptr theData ; + GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize); - if ( theType == 'TEXT' ) + 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 == 'TEXT' ) + 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 ; - wxString convert = wxMacMakeStringFromCString( theData ) ; - m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert ); + theData[dataSize] = 0 ; + theData[dataSize + 1] = 0 ; + m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData ); } + #endif else if ( theType == kDragFlavorTypeHFS ) { HFSFlavor* theFile = (HFSFlavor*) theData ; wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ; - if ( firstFileAdded ) - ((wxFileDataObject*)m_dataObject)->AddFile( name ) ; - else + if ( !firstFileAdded ) { - ((wxFileDataObject*)m_dataObject)->SetData( 0 , name.c_str() ) ; - firstFileAdded = true ; + // reset file list + ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ; + firstFileAdded = true ; } + + ((wxFileDataObject*)m_dataObject)->AddFile( name ) ; } else { m_dataObject->SetData( format, dataSize, theData ); } - delete[] theData; + + delete [] theData; } break ; } } } } - return TRUE ; + + return true ; } //------------------------------------------------------------------------- @@ -268,132 +311,153 @@ wxDropSource::~wxDropSource() { } - -wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(flags)) +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; - + OSErr result; DragReference theDrag; RgnHandle dragRegion; - if ((result = NewDrag(&theDrag))) - { + if ((result = 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 ; + for ( size_t i = 0 ; i < formatCount ; ++i ) { 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' ) + if ( type == 'TEXT' || type == 'utxt' ) { - dataSize-- ; + if ( dataSize > 0 ) + dataSize-- ; dataPtr[ dataSize ] = 0 ; - wxString st( (wxChar*) dataPtr ) ; - wxCharBuffer buf = wxMacStringToCString( st ) ; - AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0); + if ( type == 'utxt' ) + { + if ( dataSize > 0 ) + dataSize-- ; + dataPtr[ dataSize ] = 0 ; + } + + AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0); } else if (type == kDragFlavorTypeHFS ) { HFSFlavor theFlavor ; OSErr err = noErr; CInfoPBRec cat; - - wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ; - + + 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 ) + if (err == noErr) { theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags; - if (theFlavor.fileSpec.parID == fsRtParID) { + if (theFlavor.fileSpec.parID == fsRtParID) + { theFlavor.fileCreator = 'MACS'; theFlavor.fileType = 'disk'; - } else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) { + } + else if ((cat.hFileInfo.ioFlAttrib & ioDirMask) != 0) + { theFlavor.fileCreator = 'MACS'; theFlavor.fileType = 'fold'; - } else { + } + else + { theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator; theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType; } - AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0); - } + + AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0); + } } else { - AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0); + AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0); } - delete[] dataPtr ; + + delete [] dataPtr ; } - delete[] formats ; - + + delete [] formats ; + dragRegion = NewRgn(); RgnHandle tempRgn = NewRgn() ; - + EventRecord* ev = NULL ; + #if !TARGET_CARBON // TODO ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ; #else - EventRecord rec ; - ev = &rec ; - wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; + { + EventRecord rec ; + ev = &rec ; + wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ; + } #endif + const short dragRegionOuterBoundary = 10 ; const short dragRegionInnerBoundary = 9 ; - - SetRectRgn( dragRegion , ev->where.h - dragRegionOuterBoundary , + + SetRectRgn( + dragRegion , ev->where.h - dragRegionOuterBoundary , ev->where.v - dragRegionOuterBoundary , - ev->where.h + dragRegionOuterBoundary , + ev->where.h + dragRegionOuterBoundary , ev->where.v + dragRegionOuterBoundary ) ; - - SetRectRgn( tempRgn , ev->where.h - dragRegionInnerBoundary , + + SetRectRgn( + tempRgn , ev->where.h - dragRegionInnerBoundary , ev->where.v - dragRegionInnerBoundary , - ev->where.h + dragRegionInnerBoundary , + ev->where.h + dragRegionInnerBoundary , ev->where.v + dragRegionInnerBoundary ) ; - + DiffRgn( dragRegion , tempRgn , dragRegion ) ; - DisposeRgn( tempRgn ) ; - + 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); DisposeRgn(dragRegion); DisposeDrag(theDrag); gTrackingGlobals.m_currentSource = NULL ; - - return wxDragCopy ; + + 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; } bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect) { const wxCursor& cursor = GetCursor(effect); - if ( cursor.Ok() ) - { + bool result = cursor.Ok(); + + if ( result ) cursor.MacInstall() ; - return TRUE; - } - else - { - return FALSE; - } + return result; } bool gTrackingGlobalsInstalled = false ; @@ -401,19 +465,22 @@ 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... -pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow, - void *handlerRefCon, DragReference theDrag) ; -pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, void *handlerRefCon, -DragReference theDrag) ; +pascal OSErr wxMacWindowDragTrackingHandler( + DragTrackingMessage theMessage, WindowPtr theWindow, + void *handlerRefCon, DragReference theDrag) ; +pascal OSErr wxMacWindowDragReceiveHandler( + WindowPtr theWindow, void *handlerRefCon, + DragReference theDrag) ; void wxMacEnsureTrackingHandlersInstalled() { - if( !gTrackingGlobalsInstalled ) + if ( !gTrackingGlobalsInstalled ) { OSErr result; result = InstallTrackingHandler(NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L,&gTrackingGlobals); wxASSERT( result == noErr ) ; + result = InstallReceiveHandler(NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals); wxASSERT( result == noErr ) ; @@ -421,24 +488,30 @@ void wxMacEnsureTrackingHandlersInstalled() } } -pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, WindowPtr theWindow, - void *handlerRefCon, DragReference theDrag) -{ +pascal OSErr wxMacWindowDragTrackingHandler( + DragTrackingMessage theMessage, WindowPtr theWindow, + void *handlerRefCon, DragReference theDrag) +{ MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon; Point mouse, localMouse; DragAttributes attributes; GetDragAttributes(theDrag, &attributes); - wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; - switch(theMessage) + wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ; + + bool optionDown = GetCurrentKeyModifiers() & optionKey ; + wxDragResult result = optionDown ? wxDragCopy : wxDragMove; + + switch (theMessage) { case kDragTrackingEnterHandler: - break; case kDragTrackingLeaveHandler: break; + case kDragTrackingEnterWindow: trackingGlobals->m_currentTargetWindow = NULL ; trackingGlobals->m_currentTarget = NULL ; break; + case kDragTrackingInWindow: if (toplevel == NULL) break; @@ -446,16 +519,22 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind GetDragMouse(theDrag, &mouse, 0L); localMouse = mouse; GlobalToLocal(&localMouse); - -// if (attributes & kDragHasLeftSenderWindow) + { - wxPoint point(localMouse.h , localMouse.v) ; wxWindow *win = NULL ; - toplevel->MacGetWindowFromPointSub( point , &win ) ; + ControlPartCode controlPart ; + ControlRef control = wxMacFindControlUnderMouse( + toplevel , localMouse , + theWindow , &controlPart ) ; + if ( control ) + win = wxFindControlFromMacControl( control ) ; + else + win = toplevel ; + int localx , localy ; localx = localMouse.h ; localy = localMouse.v ; - //TODO : should we use client coordinates + if ( win ) win->MacRootWindowToWindow( &localx , &localy ) ; if ( win != trackingGlobals->m_currentTargetWindow ) @@ -465,62 +544,35 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind // this window is left if ( trackingGlobals->m_currentTarget ) { - HideDragHilite(theDrag); + HideDragHilite( theDrag ); trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; trackingGlobals->m_currentTarget->OnLeave() ; trackingGlobals->m_currentTarget = NULL; trackingGlobals->m_currentTargetWindow = NULL ; } } + if ( win ) { // this window is entered trackingGlobals->m_currentTargetWindow = win ; trackingGlobals->m_currentTarget = win->GetDropTarget() ; { - wxDragResult result = wxDragNone ; - if ( trackingGlobals->m_currentTarget ) - { - trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - result = trackingGlobals->m_currentTarget->OnEnter( - localx , localy , wxDragCopy ) ; - } - - if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE ) + if ( trackingGlobals->m_currentTarget ) { - if ( trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) == FALSE ) - { - 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 ; - } - } + 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() ; - SetRectRgn( hiliteRgn , x , y , x+win->GetSize().x ,y+win->GetSize().y) ; + Rect r = { y , x , y + win->GetSize().y , x + win->GetSize().x } ; + RectRgn( hiliteRgn , &r ) ; ShowDragHilite(theDrag, hiliteRgn, true); DisposeRgn( hiliteRgn ) ; } @@ -529,19 +581,55 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind } else { - if( trackingGlobals->m_currentTarget ) + if ( trackingGlobals->m_currentTarget ) { trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; - trackingGlobals->m_currentTarget->OnDragOver( - localx , localy , wxDragCopy ) ; + trackingGlobals->m_currentTarget->OnDragOver( localx , localy , result ) ; } } - - } - // MyTrackItemUnderMouse(localMouse, theWindow); + + // set cursor for OnEnter and OnDragOver + if ( !trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) ) + { + if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) ) + { + 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 wxDragError: + case wxDragLink: + case wxDragCancel: + default: + // put these here to make gcc happy + ; + } + } + } + } break; + case kDragTrackingLeaveWindow: - if (trackingGlobals->m_currentTarget) + if (trackingGlobals->m_currentTarget) { trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ; trackingGlobals->m_currentTarget->OnLeave() ; @@ -550,34 +638,44 @@ pascal OSErr wxMacWindowDragTrackingHandler(DragTrackingMessage theMessage, Wind } trackingGlobals->m_currentTargetWindow = NULL ; break; + + default: + break; } - return(noErr); + + return noErr; } -pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, - void *handlerRefCon, - DragReference theDrag) -{ - MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon; +pascal OSErr wxMacWindowDragReceiveHandler( + WindowPtr theWindow, + void *handlerRefCon, + DragReference theDrag) +{ + 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); localMouse = mouse; GlobalToLocal(&localMouse); localx = localMouse.h ; localy = localMouse.v ; - //TODO : should we use client coordinates + + // 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_currentTarget->OnData( localx , localy , wxDragCopy ) ; + bool optionDown = GetCurrentKeyModifiers() & optionKey ; + wxDragResult result = optionDown ? wxDragCopy : wxDragMove; + trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ; } } - return(noErr); + + return noErr; } + #endif