///////////////////////////////////////////////////////////////////////////////
// Name: dnd.cpp
// Purpose: wxDropTarget, wxDropSource, wxDataObject implementation
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) 1998 AUTHOR
+// Copyright: (c) 1998 Stefan Csomor
// Licence: wxWindows licence
///////////////////////////////////////////////////////////////////////////////
#pragma implementation "dnd.h"
#endif
+#include "wx/defs.h"
+
+#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"
-
-#if wxUSE_DRAG_AND_DROP
+#include "wx/mac/private.h"
// ----------------------------------------------------------------------------
// global
bool supported = false ;
if ( gTrackingGlobals.m_currentSource != NULL )
{
- wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
-
- if ( data )
- {
- int formatcount = data->GetFormatCount() ;
- wxDataFormat *array = new wxDataFormat[ formatcount ];
- data->GetAllFormats( array );
- for (size_t i = 0; !supported && i < formatcount ; i++)
+ wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
+
+ if ( data )
{
- wxDataFormat format = array[i] ;
- if ( m_dataObject->IsSupported( format ) )
+ size_t formatcount = data->GetFormatCount() ;
+ wxDataFormat *array = new wxDataFormat[ formatcount ];
+ data->GetAllFormats( array );
+ for (size_t i = 0; !supported && i < formatcount ; i++)
{
- supported = true ;
- break ;
+ wxDataFormat format = array[i] ;
+ if ( m_dataObject->IsSupported( format ) )
+ {
+ supported = true ;
+ break ;
+ }
}
+ delete[] array ;
}
- delete[] array ;
- }
}
if ( !supported )
{
- UInt16 items ;
- OSErr result;
- CountDragItems(m_currentDrag, &items);
- for (UInt16 index = 1; index <= items && supported == false ; ++index)
- {
- ItemReference theItem;
- FlavorType theType ;
- UInt16 flavors = 0 ;
- GetDragItemReferenceNumber(m_currentDrag, index, &theItem);
- CountDragItemFlavors( m_currentDrag, theItem , &flavors ) ;
- for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
- {
- result = GetFlavorType(m_currentDrag, theItem, flavor , &theType);
- if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
+ UInt16 items ;
+ OSErr result;
+ CountDragItems((DragReference)m_currentDrag, &items);
+ for (UInt16 index = 1; index <= items && supported == false ; ++index)
+ {
+ ItemReference theItem;
+ FlavorType theType ;
+ UInt16 flavors = 0 ;
+ GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
+ CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
+ for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
{
- supported = true ;
- break ;
+ result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
+ if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
+ {
+ supported = true ;
+ break ;
+ }
}
- }
- }
+ }
}
return supported ;
}
{
if (!m_dataObject)
return FALSE;
-
+
if ( !CurrentDragHasSupportedFormat() )
return FALSE ;
-
+
bool transferred = false ;
if ( gTrackingGlobals.m_currentSource != NULL )
{
- wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
-
- if ( data )
- {
- int formatcount = data->GetFormatCount() ;
- wxDataFormat *array = new wxDataFormat[ formatcount ];
- data->GetAllFormats( array );
- for (size_t i = 0; !transferred && i < formatcount ; i++)
+ wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject() ;
+
+ if ( data )
{
- wxDataFormat format = array[i] ;
- if ( m_dataObject->IsSupported( format ) )
+ size_t formatcount = data->GetFormatCount() ;
+ wxDataFormat *array = new wxDataFormat[ formatcount ];
+ data->GetAllFormats( array );
+ for (size_t i = 0; !transferred && i < formatcount ; i++)
{
- int size = data->GetDataSize( format );
- transferred = true ;
-
- if (size == 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 ;
- }
+ wxDataFormat format = array[i] ;
+ if ( m_dataObject->IsSupported( format ) )
+ {
+ int size = data->GetDataSize( format );
+ transferred = true ;
+
+ if (size == 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 ;
+ }
+ }
}
- }
- delete[] array ;
- }
+ delete[] array ;
+ }
}
if ( !transferred )
{
- UInt16 items ;
- OSErr result;
- CountDragItems(m_currentDrag, &items);
- for (UInt16 index = 1; index <= items; ++index)
- {
- ItemReference theItem;
- FlavorType theType ;
- UInt16 flavors = 0 ;
- GetDragItemReferenceNumber(m_currentDrag, index, &theItem);
- CountDragItemFlavors( m_currentDrag, theItem , &flavors ) ;
- for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
- {
- result = GetFlavorType(m_currentDrag, theItem, flavor , &theType);
- wxDataFormat format(theType) ;
- if ( m_dataObject->IsSupportedFormat( format ) )
+ UInt16 items ;
+ OSErr result;
+ bool firstFileAdded = false ;
+ CountDragItems((DragReference)m_currentDrag, &items);
+ for (UInt16 index = 1; index <= items; ++index)
+ {
+ ItemReference theItem;
+ FlavorType theType ;
+ UInt16 flavors = 0 ;
+ GetDragItemReferenceNumber((DragReference)m_currentDrag, index, &theItem);
+ CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors ) ;
+ for ( UInt16 flavor = 1 ; flavor <= flavors ; ++flavor )
{
- FlavorFlags theFlags;
- result = GetFlavorFlags(m_currentDrag, theItem, theType, &theFlags);
- if (result == noErr)
- {
- Size dataSize ;
- Ptr theData ;
- GetFlavorDataSize(m_currentDrag, theItem, theType, &dataSize);
- if ( theType == 'TEXT' )
- dataSize++ ;
- theData = new char[dataSize];
- GetFlavorData(m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L);
- if( theType == 'TEXT' )
- {
- theData[dataSize]=0 ;
- if ( wxApp::s_macDefaultEncodingIsPC )
+ result = GetFlavorType((DragReference)m_currentDrag, theItem, flavor , &theType);
+ wxDataFormat format(theType) ;
+ if ( m_dataObject->IsSupportedFormat( format ) )
+ {
+ FlavorFlags theFlags;
+ result = GetFlavorFlags((DragReference)m_currentDrag, theItem, theType, &theFlags);
+ if (result == noErr)
{
- wxMacConvertToPC((char*)theData) ;
+ Size dataSize ;
+ Ptr theData ;
+ GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
+ if ( theType == 'TEXT' )
+ {
+ // this increment is only valid for allocating, on the next GetFlavorData
+ // call it is reset again to the original value
+ dataSize++ ;
+ }
+ theData = new char[dataSize];
+ GetFlavorData((DragReference)m_currentDrag, theItem, theType, (void*) theData, &dataSize, 0L);
+ if( theType == 'TEXT' )
+ {
+ theData[dataSize]=0 ;
+ wxString convert( theData , wxConvLocal ) ;
+ m_dataObject->SetData( format, convert.Length() * sizeof(wxChar), (const wxChar*) convert );
+ }
+ else if ( theType == kDragFlavorTypeHFS )
+ {
+ HFSFlavor* theFile = (HFSFlavor*) theData ;
+ wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
+ if ( firstFileAdded )
+ ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
+ else
+ {
+ ((wxFileDataObject*)m_dataObject)->SetData( 0 , name.c_str() ) ;
+ firstFileAdded = true ;
+ }
+ }
+ else
+ {
+ m_dataObject->SetData( format, dataSize, theData );
+ }
+ delete[] theData;
}
- m_dataObject->SetData( format, dataSize, theData );
- }
- else if ( theType == kDragFlavorTypeHFS )
- {
- HFSFlavor* theFile = (HFSFlavor*) theData ;
- wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
- m_dataObject->SetData( format , name.Length() + 1, name ) ;
- }
- else
- {
- m_dataObject->SetData( format, dataSize, theData );
- }
- delete[] theData;
- }
- break ;
+ break ;
+ }
}
- }
- }
+ }
}
return TRUE ;
}
// drag request
wxDropSource::wxDropSource(wxWindow *win,
- const wxIcon &iconCopy,
- const wxIcon &iconMove,
- const wxIcon &iconNone)
+ const wxCursor &cursorCopy,
+ const wxCursor &cursorMove,
+ const wxCursor &cursorStop)
+ : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
wxMacEnsureTrackingHandlersInstalled() ;
m_window = win;
wxDropSource::wxDropSource(wxDataObject& data,
wxWindow *win,
- const wxIcon &iconCopy,
- const wxIcon &iconMove,
- const wxIcon &iconNone)
+ const wxCursor &cursorCopy,
+ const wxCursor &cursorMove,
+ const wxCursor &cursorStop)
+ : wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
wxMacEnsureTrackingHandlersInstalled() ;
SetData( data );
}
-wxDragResult wxDropSource::DoDragDrop( bool allowMove )
+wxDragResult wxDropSource::DoDragDrop(int WXUNUSED(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)))
{
return wxDragNone ;
}
wxDataFormat *formats = new wxDataFormat[formatCount] ;
m_data->GetAllFormats( formats ) ;
ItemReference theItem = 1 ;
- for ( int 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] ;
OSType type = formats[i].GetFormatId() ;
if ( type == 'TEXT' )
{
- dataSize-- ;
- if ( wxApp::s_macDefaultEncodingIsPC )
- {
- wxMacConvertFromPC((char*)dataPtr) ;
- }
- AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);
+ dataSize-- ;
+ dataPtr[ dataSize ] = 0 ;
+ wxString st( (wxChar*) dataPtr ) ;
+ wxCharBuffer buf = st.mb_str( wxConvLocal) ;
+ AddDragItemFlavor(theDrag, theItem, type , buf.data(), strlen(buf), 0);
}
else if (type == kDragFlavorTypeHFS )
{
- HFSFlavor theFlavor ;
- OSErr err = noErr;
- CInfoPBRec cat;
-
- wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ;
-
- 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;
- }
- AddDragItemFlavor(theDrag, theItem, type , &theFlavor, sizeof(theFlavor), 0);
- }
+ HFSFlavor theFlavor ;
+ OSErr err = noErr;
+ CInfoPBRec cat;
+
+ wxMacFilename2FSSpec( dataPtr , &theFlavor.fileSpec ) ;
+
+ 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;
+ }
+ 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 ;
}
dragRegion = NewRgn();
RgnHandle tempRgn = NewRgn() ;
- EventRecord* ev = wxTheApp->MacGetCurrentEvent() ;
+ EventRecord* ev = NULL ;
+#if !TARGET_CARBON // TODO
+ ev = (EventRecord*) wxTheApp->MacGetCurrentEvent() ;
+#else
+ EventRecord rec ;
+ ev = &rec ;
+ wxMacConvertEventToRecord( (EventRef) wxTheApp->MacGetCurrentEvent() , &rec ) ;
+#endif
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 ) ;
-
+ 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 ) ;
-
+ ev->where.v - dragRegionInnerBoundary ,
+ ev->where.h + dragRegionInnerBoundary ,
+ ev->where.v + dragRegionInnerBoundary ) ;
+
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);
DisposeRgn(dragRegion);
DisposeDrag(theDrag);
gTrackingGlobals.m_currentSource = NULL ;
+
+ KeyMap keymap;
+ GetKeys(keymap);
+ bool optionDown = keymap[1] & 4;
+ wxDragResult dndresult = optionDown ? wxDragCopy : wxDragMove;
+ return dndresult;
+}
+
+bool wxDropSource::MacInstallDefaultCursor(wxDragResult effect)
+{
+ const wxCursor& cursor = GetCursor(effect);
+ if ( cursor.Ok() )
+ {
+ cursor.MacInstall() ;
- return wxDragCopy ;
+ return TRUE;
+ }
+ else
+ {
+ return FALSE;
+ }
}
bool gTrackingGlobalsInstalled = false ;
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
Point mouse, localMouse;
DragAttributes attributes;
- RgnHandle hiliteRgn;
GetDragAttributes(theDrag, &attributes);
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
+
+ KeyMap keymap;
+ GetKeys(keymap);
+ bool optionDown = keymap[1] & 4;
+ wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+
switch(theMessage)
{
case kDragTrackingEnterHandler:
case kDragTrackingLeaveHandler:
break;
case kDragTrackingEnterWindow:
- trackingGlobals->m_currentTargetWindow = NULL ;
+ trackingGlobals->m_currentTargetWindow = NULL ;
trackingGlobals->m_currentTarget = NULL ;
break;
case kDragTrackingInWindow:
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( localMouse ,
+ theWindow , &controlPart ) ;
+ if ( control )
+ win = wxFindControlFromMacControl( control ) ;
+ // TODO toplevel->MacGetWindowFromPointSub( point , &win ) ;
int localx , localy ;
localx = localMouse.h ;
localy = localMouse.v ;
// this window is entered
trackingGlobals->m_currentTargetWindow = win ;
trackingGlobals->m_currentTarget = win->GetDropTarget() ;
- if ( trackingGlobals->m_currentTarget )
{
- trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
- if ( trackingGlobals->m_currentTarget->OnEnter(
- localx , localy , wxDragCopy ) != wxDragNone )
+
+ if ( trackingGlobals->m_currentTarget )
+ {
+ 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) ;
- ShowDragHilite(theDrag, hiliteRgn, true);
- DisposeRgn( hiliteRgn ) ;
+ 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 ) ;
+ ShowDragHilite(theDrag, hiliteRgn, true);
+ DisposeRgn( hiliteRgn ) ;
}
}
}
{
trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
trackingGlobals->m_currentTarget->OnDragOver(
- localx , localy , wxDragCopy ) ;
+ localx , localy , result ) ;
}
}
+
+ // set cursor for OnEnter and OnDragOver
+ if ( trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) == FALSE )
+ {
+ 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 ;
+
+ case wxDragError:
+ case wxDragLink:
+ case wxDragCancel:
+ // put these here to make gcc happy
+ ;
+ }
+ }
+ }
}
// MyTrackItemUnderMouse(localMouse, theWindow);
return(noErr);
}
-pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow, void *handlerRefCon,
-DragReference theDrag)
+pascal OSErr wxMacWindowDragReceiveHandler(WindowPtr theWindow,
+ void *handlerRefCon,
+ DragReference theDrag)
{
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
if ( trackingGlobals->m_currentTarget )
trackingGlobals->m_currentTargetWindow->MacRootWindowToWindow( &localx , &localy ) ;
if ( trackingGlobals->m_currentTarget->OnDrop( localx , localy ) )
{
- trackingGlobals->m_currentTarget->OnData( localx , localy , wxDragCopy ) ;
+ KeyMap keymap;
+ GetKeys(keymap);
+ bool optionDown = keymap[1] & 4;
+ wxDragResult result = optionDown ? wxDragCopy : wxDragMove;
+ trackingGlobals->m_currentTarget->OnData( localx , localy , result ) ;
}
}
return(noErr);
projects / wxWidgets.git / blobdiff