#include <Scrap.h>
#endif
+
// ----------------------------------------------------------------------------
// globals
// ----------------------------------------------------------------------------
typedef struct
{
- wxWindow* m_currentTargetWindow ;
- wxDropTarget* m_currentTarget ;
- wxDropSource* m_currentSource ;
+ wxWindow* m_currentTargetWindow;
+ wxDropTarget* m_currentTarget;
+ wxDropSource* m_currentSource;
}
-MacTrackingGlobals ;
+MacTrackingGlobals;
-MacTrackingGlobals gTrackingGlobals ;
+MacTrackingGlobals gTrackingGlobals;
void wxMacEnsureTrackingHandlersInstalled() ;
bool wxDropTarget::OnDrop( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y) )
{
- if (!m_dataObject)
+ if (m_dataObject == NULL)
return false;
return CurrentDragHasSupportedFormat() ;
wxDragResult wxDropTarget::OnData( wxCoord WXUNUSED(x), wxCoord WXUNUSED(y),
wxDragResult def )
{
- if (!m_dataObject)
+ if (m_dataObject == NULL)
return wxDragNone;
if (!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() ;
- wxDataFormat *array = new wxDataFormat[ formatcount ];
+ wxDataFormat *array = new wxDataFormat[formatcount];
data->GetAllFormats( array );
for (size_t i = 0; !supported && i < formatcount ; i++)
{
FlavorType theType ;
UInt16 flavors = 0 ;
- CountDragItems((DragReference)m_currentDrag, &items);
- for (UInt16 index = 1; index <= items && !supported ; ++index)
+ 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 ) ;
+ 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);
+ result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
if ( m_dataObject->IsSupportedFormat( wxDataFormat( theType ) ) )
{
supported = true ;
bool wxDropTarget::GetData()
{
- if (!m_dataObject)
+ if (m_dataObject == NULL)
return false;
if ( !CurrentDragHasSupportedFormat() )
if (size == 0)
{
- m_dataObject->SetData(format , 0 , 0 ) ;
+ m_dataObject->SetData( format , 0 , 0 );
}
else
{
UInt16 flavors ;
bool firstFileAdded = false ;
- CountDragItems((DragReference)m_currentDrag, &items);
+ 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 ) ;
+ GetDragItemReferenceNumber( (DragReference)m_currentDrag, index, &theItem );
+ CountDragItemFlavors( (DragReference)m_currentDrag, theItem , &flavors );
+ wxDataFormat preferredFormat = m_dataObject->GetPreferredFormat( wxDataObject::Set );
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) ;
+ result = GetFlavorType( (DragReference)m_currentDrag, theItem, flavor, &theType );
+ wxDataFormat format( theType );
if ( preferredFormat == format )
{
hasPreferredFormat = true ;
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 = 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);
+ result = GetFlavorFlags( (DragReference)m_currentDrag, theItem, theType, &theFlags );
if (result == noErr)
{
Size dataSize ;
Ptr theData ;
- GetFlavorDataSize((DragReference)m_currentDrag, theItem, theType, &dataSize);
+ 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
+ // 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
+ // 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);
+
+ 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
+#if wxUSE_UNICODE
else if ( theType == kScrapFlavorTypeUnicode )
{
- theData[dataSize] = 0 ;
+ theData[dataSize + 0] =
theData[dataSize + 1] = 0 ;
m_dataObject->SetData( wxDataFormat(wxDF_UNICODETEXT), dataSize , theData );
}
- #endif
+#endif
else if ( theType == kDragFlavorTypeHFS )
{
- HFSFlavor* theFile = (HFSFlavor*) theData ;
- wxString name = wxMacFSSpec2MacFilename( &theFile->fileSpec ) ;
- if ( !firstFileAdded )
+ wxFileDataObject *fdo = dynamic_cast<wxFileDataObject*>(m_dataObject);
+ wxASSERT( fdo != NULL );
+
+ if ((theData != NULL) && (fdo != NULL))
{
- // reset file list
- ((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;
- firstFileAdded = true ;
+ 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 ) ;
}
-
- ((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
}
else
{
: wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
wxMacEnsureTrackingHandlersInstalled() ;
+
m_window = win;
}
: wxDropSourceBase(cursorCopy, cursorMove, cursorStop)
{
wxMacEnsureTrackingHandlersInstalled() ;
+
SetData( data );
m_window = win;
}
dataPtr[ dataSize ] = 0 ;
}
- AddDragItemFlavor(theDrag, theItem, type , dataPtr, dataSize, 0);
+ AddDragItemFlavor( theDrag, theItem, type , dataPtr, dataSize, 0 );
}
else if (type == kDragFlavorTypeHFS )
{
OSErr err = noErr;
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.ioVRefNum = theFlavor.fileSpec.vRefNum;
cat.hFileInfo.ioDirID = theFlavor.fileSpec.parID;
cat.hFileInfo.ioFDirIndex = 0;
- err = PBGetCatInfoSync(&cat);
+ err = PBGetCatInfoSync( &cat );
if (err == noErr)
{
theFlavor.fdFlags = cat.hFileInfo.ioFlFndrInfo.fdFlags;
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 ;
DiffRgn( dragRegion , tempRgn , dragRegion ) ;
DisposeRgn( tempRgn ) ;
- // TODO:work with promises in order to return data only when drag
- // was successfully completed
+ // 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 ;
+ gTrackingGlobals.m_currentSource = this;
+ result = TrackDrag( theDrag, ev, dragRegion );
+ DisposeRgn( dragRegion );
+ DisposeDrag( theDrag );
+ gTrackingGlobals.m_currentSource = NULL;
- bool optionDown = GetCurrentKeyModifiers() & optionKey ;
- wxDragResult dndresult = 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;
bool result = cursor.Ok();
if ( result )
- cursor.MacInstall() ;
+ cursor.MacInstall();
return result;
}
pascal OSErr wxMacWindowDragTrackingHandler(
DragTrackingMessage theMessage, WindowPtr theWindow,
- void *handlerRefCon, DragReference theDrag) ;
+ void *handlerRefCon, DragReference theDrag );
pascal OSErr wxMacWindowDragReceiveHandler(
WindowPtr theWindow, void *handlerRefCon,
- DragReference theDrag) ;
+ DragReference theDrag );
void wxMacEnsureTrackingHandlersInstalled()
{
{
OSErr result;
- result = InstallTrackingHandler(NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L,&gTrackingGlobals);
- wxASSERT( result == noErr ) ;
+ result = InstallTrackingHandler( NewDragTrackingHandlerUPP(wxMacWindowDragTrackingHandler), 0L, &gTrackingGlobals );
+ wxASSERT( result == noErr );
- result = InstallReceiveHandler(NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals);
- wxASSERT( result == noErr ) ;
+ result = InstallReceiveHandler( NewDragReceiveHandlerUPP(wxMacWindowDragReceiveHandler), 0L, &gTrackingGlobals );
+ wxASSERT( result == noErr );
- gTrackingGlobalsInstalled = true ;
+ gTrackingGlobalsInstalled = true;
}
}
pascal OSErr wxMacWindowDragTrackingHandler(
DragTrackingMessage theMessage, WindowPtr theWindow,
- void *handlerRefCon, DragReference theDrag)
+ void *handlerRefCon, DragReference theDrag )
{
MacTrackingGlobals* trackingGlobals = (MacTrackingGlobals*) handlerRefCon;
+
Point mouse, localMouse;
DragAttributes attributes;
- GetDragAttributes(theDrag, &attributes);
+
+ GetDragAttributes( theDrag, &attributes );
+
wxTopLevelWindowMac* toplevel = wxFindWinFromMacWindow( theWindow ) ;
bool optionDown = GetCurrentKeyModifiers() & optionKey ;
break;
case kDragTrackingEnterWindow:
- trackingGlobals->m_currentTargetWindow = NULL ;
- trackingGlobals->m_currentTarget = NULL ;
+ if (trackingGlobals != NULL)
+ {
+ trackingGlobals->m_currentTargetWindow = NULL ;
+ trackingGlobals->m_currentTarget = NULL ;
+ }
break;
case kDragTrackingInWindow:
+ if (trackingGlobals == NULL)
+ break;
if (toplevel == NULL)
break;
- GetDragMouse(theDrag, &mouse, 0L);
+ GetDragMouse( theDrag, &mouse, 0L );
localMouse = mouse;
- GlobalToLocal(&localMouse);
+ GlobalToLocal( &localMouse );
{
wxWindow *win = NULL ;
ControlPartCode controlPart ;
ControlRef control = wxMacFindControlUnderMouse(
- toplevel , localMouse ,
- theWindow , &controlPart ) ;
+ toplevel , localMouse , theWindow , &controlPart ) ;
if ( control )
win = wxFindControlFromMacControl( control ) ;
else
if ( trackingGlobals->m_currentTarget )
{
HideDragHilite( theDrag );
- trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
- trackingGlobals->m_currentTarget->OnLeave() ;
+ trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
+ trackingGlobals->m_currentTarget->OnLeave();
trackingGlobals->m_currentTarget = NULL;
- trackingGlobals->m_currentTargetWindow = NULL ;
+ trackingGlobals->m_currentTargetWindow = NULL;
}
}
RgnHandle hiliteRgn = NewRgn() ;
Rect r = { y , x , y + win->GetSize().y , x + win->GetSize().x } ;
RectRgn( hiliteRgn , &r ) ;
- ShowDragHilite(theDrag, hiliteRgn, true);
+ ShowDragHilite( theDrag, hiliteRgn, true );
DisposeRgn( hiliteRgn ) ;
}
}
}
// set cursor for OnEnter and OnDragOver
- if ( !trackingGlobals->m_currentSource && trackingGlobals->m_currentSource->GiveFeedback( result ) )
+ if ( trackingGlobals->m_currentSource && !trackingGlobals->m_currentSource->GiveFeedback( result ) )
{
if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) )
{
break;
case kDragTrackingLeaveWindow:
+ if (trackingGlobals == NULL)
+ break;
+
if (trackingGlobals->m_currentTarget)
{
- trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag ) ;
- trackingGlobals->m_currentTarget->OnLeave() ;
- HideDragHilite(theDrag);
- trackingGlobals->m_currentTarget = NULL ;
+ trackingGlobals->m_currentTarget->SetCurrentDrag( theDrag );
+ trackingGlobals->m_currentTarget->OnLeave();
+ HideDragHilite( theDrag );
+ trackingGlobals->m_currentTarget = NULL;
}
- trackingGlobals->m_currentTargetWindow = NULL ;
+ trackingGlobals->m_currentTargetWindow = NULL;
break;
default:
projects / wxWidgets.git / blobdiff