///////////////////////////////////////////////////////////////////////////////
-// Name: dnd.cpp
+// Name: src/mac/carbon/dnd.cpp
// Purpose: wxDropTarget, wxDropSource implementations
// Author: Stefan Csomor
// Modified by:
#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"
+
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/toplevel.h"
+ #include "wx/gdicmn.h"
+#endif // WX_PRECOMP
+
#include "wx/mac/private.h"
#ifndef __DARWIN__
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
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;
}
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;
bool wxDropTarget::CurrentDragHasSupportedFormat()
{
- bool supported = false ;
+ bool supported = 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;
+ UInt16 items;
ItemReference theItem;
- FlavorType theType ;
- UInt16 flavors = 0 ;
+ FlavorType theType;
+ UInt16 flavors = 0;
CountDragItems( (DragReference)m_currentDrag, &items );
for (UInt16 index = 1; index <= items && !supported; ++index)
{
- flavors = 0 ;
+ flavors = 0;
GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem );
CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors );
- for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
+ 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 ;
- break ;
+ supported = true;
+ break;
}
}
}
}
- return supported ;
+ return supported;
}
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 ;
+ UInt16 items;
OSErr result;
ItemReference theItem;
- FlavorType theType ;
+ FlavorType theType;
FlavorFlags theFlags;
- UInt16 flavors ;
- bool firstFileAdded = false ;
+ UInt16 flavors;
+ wxString filenamesPassed;
CountDragItems( (DragReference)m_currentDrag, &items );
for (UInt16 index = 1; index <= items; ++index)
{
- flavors = 0 ;
+ flavors = 0;
GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem );
- CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors );
+ CountDragItemFlavors( (DragReference)m_currentDrag, theItem, &flavors );
wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set );
- bool hasPreferredFormat = false ;
+ bool hasPreferredFormat = false;
- for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
+ for (UInt16 flavor = 1; flavor <= flavors; ++flavor)
{
result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
wxDataFormat format( theType );
- if ( preferredFormat == format )
+ if (preferredFormat == format)
{
- hasPreferredFormat = true ;
- break ;
+ hasPreferredFormat = true;
+ break;
}
}
- for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
+ for (UInt16 flavor = 1; flavor <= flavors; ++flavor)
{
result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
- wxDataFormat format( theType ) ;
- if ( (hasPreferredFormat && format == preferredFormat)
+ 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 ;
+ Size dataSize;
+ Ptr theData;
GetFlavorDataSize( (DragReference)m_currentDrag, theItem, theType, &dataSize );
- if ( theType == kScrapFlavorTypeText )
+ if (theType == kScrapFlavorTypeText)
{
// this increment is only valid for allocating:
// on the next GetFlavorData call it is reset again to the original value
- dataSize++ ;
+ dataSize++;
}
- else if ( theType == kScrapFlavorTypeUnicode )
+ 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++ ;
+ dataSize++;
+ dataSize++;
}
- theData = new char[dataSize];
+ if (dataSize > 0)
+ theData = new char[dataSize];
+ else
+ theData = NULL;
- 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 )
+ GetFlavorData( (DragReference)m_currentDrag, theItem, theType, (void*)theData, &dataSize, 0L );
+ switch (theType)
{
+ case kScrapFlavorTypeText:
+ theData[dataSize] = 0;
+ m_dataObject->SetData( wxDataFormat(wxDF_TEXT), dataSize, theData );
+ break;
+
+#if wxUSE_UNICODE
+ case kScrapFlavorTypeUnicode:
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 )
+ theData[dataSize + 1] = 0;
+ m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize, theData );
+ break;
+#endif
+
+ case kDragFlavorTypeHFS:
+ if (theData != NULL)
{
- // reset file list
- ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;
- firstFileAdded = true ;
+ HFSFlavor* theFile = (HFSFlavor*)theData;
+#ifndef __LP64__
+ wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec );
+
+ if (!name.empty())
+ filenamesPassed += name + wxT("\n");
+#endif
}
+ break;
- ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
- }
- else
- {
+ default:
m_dataObject->SetData( format, dataSize, theData );
+ break;
}
delete [] theData;
}
- break ;
+ break;
}
}
}
+
+ if (filenamesPassed.length() > 0)
+ {
+ wxCharBuffer buf = filenamesPassed.fn_str();
+ m_dataObject->SetData( wxDataFormat(wxDF_FILENAME), strlen( buf ), (const char*)buf );
+ }
}
- return true ;
+ return true;
}
//-------------------------------------------------------------------------
const wxCursor &cursorStop)
: wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
- wxMacEnsureTrackingHandlersInstalled() ;
+ wxMacEnsureTrackingHandlersInstalled();
m_window = win;
}
const wxCursor &cursorStop)
: wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
- wxMacEnsureTrackingHandlersInstalled() ;
+ wxMacEnsureTrackingHandlersInstalled();
SetData( data );
m_window = win;
{
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 ;
+
+ 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 ;
+ size_t formatCount = m_data->GetFormatCount();
+ wxDataFormat *formats = new wxDataFormat[formatCount];
+ m_data->GetAllFormats( formats );
+ ItemReference theItem = (ItemReference) 1;
- for ( size_t i = 0 ; i < formatCount ; ++i )
+ 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() ;
+ 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 ;
+ dataSize--;
+ dataPtr[ dataSize ] = 0;
if ( type == 'utxt' )
{
if ( dataSize > 0 )
- dataSize-- ;
- dataPtr[ dataSize ] = 0 ;
+ dataSize--;
+ dataPtr[ dataSize ] = 0;
}
- AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 );
+ AddDragItemFlavor( theDrag, theItem, type, dataPtr, dataSize, 0 );
}
else if (type == kDragFlavorTypeHFS )
{
- HFSFlavor theFlavor ;
+ HFSFlavor theFlavor;
OSErr err = noErr;
+#ifndef __LP64__
CInfoPBRec cat;
- wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec ) ;
+ wxMacFilename2FSSpec( wxString( dataPtr, *wxConvCurrent ), &theFlavor.fileSpec );
memset( &cat, 0, sizeof(cat) );
cat.hFileInfo.ioNamePtr = theFlavor.fileSpec.name;
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)
{
theFlavor.fileCreator = cat.hFileInfo.ioFlFndrInfo.fdCreator;
theFlavor.fileType = cat.hFileInfo.ioFlFndrInfo.fdType;
}
-
- AddDragItemFlavor( theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0 );
+#endif
+ 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() ;
+ RgnHandle tempRgn = NewRgn();
- EventRecord* ev = NULL ;
+ EventRecord* ev = NULL;
#if !TARGET_CARBON // TODO
- ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
+ 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 ;
+ 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,
+ ev->where.h - dragRegionOuterBoundary,
+ ev->where.v - dragRegionOuterBoundary,
+ ev->where.h + dragRegionOuterBoundary,
+ ev->where.v + dragRegionOuterBoundary );
SetRectRgn(
- tempRgn , ev->where.h - dragRegionInnerBoundary ,
- ev->where.v - dragRegionInnerBoundary ,
- ev->where.h + dragRegionInnerBoundary ,
- ev->where.v + dragRegionInnerBoundary ) ;
+ tempRgn,
+ ev->where.h - dragRegionInnerBoundary,
+ ev->where.v - dragRegionInnerBoundary,
+ ev->where.h + dragRegionInnerBoundary,
+ ev->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;
+
+ 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)
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...
{
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;
}
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)
case kDragTrackingEnterWindow:
if (trackingGlobals != NULL)
{
- trackingGlobals->m_currentTargetWindow = NULL ;
- trackingGlobals->m_currentTarget = NULL ;
+ trackingGlobals->m_currentTargetWindow = NULL;
+ trackingGlobals->m_currentTarget = NULL;
}
break;
GetDragMouse( theDrag, &mouse, 0L );
localMouse = mouse;
- GlobalToLocal( &localMouse );
+ wxMacGlobalToLocal( theWindow, &localMouse );
{
- wxWindow *win = NULL ;
- ControlPartCode controlPart ;
+ wxWindow *win = NULL;
+ ControlPartCode controlPart;
ControlRef control = wxMacFindControlUnderMouse(
- toplevel , localMouse , theWindow , &controlPart ) ;
+ toplevel, 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 )
// 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;
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 );
}
}
}
{
if ( trackingGlobals->m_currentTarget )
{
- trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
- trackingGlobals->m_currentTarget->OnDragOver( localx , localy , result ) ;
+ trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
+ trackingGlobals->m_currentTarget->OnDragOver( localx, localy, result );
}
}
{
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:
// put these here to make gcc happy
;
}
+
+ if (cursorID != wxCURSOR_NONE)
+ {
+ wxCursor cursor( cursorID );
+ cursor.MacInstall();
+ }
}
}
}
{
trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
trackingGlobals->m_currentTarget->OnLeave();
+#ifndef __LP64__
HideDragHilite( theDrag );
+#endif
trackingGlobals->m_currentTarget = NULL;
}
trackingGlobals->m_currentTargetWindow = NULL;
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
+
projects / wxWidgets.git / blobdiff