AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-03-24 17:19:35 +00:00
parent 6fa9383b57
commit de5e599c8a
1 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mac/carbon/dnd.cpp
View File

@ -188,8 +188,6 @@ bool wxDropTarget::GetData()
FlavorType theType; FlavorType theType;
FlavorFlags theFlags; FlavorFlags theFlags;
UInt16 flavors; UInt16 flavors;
bool firstFileAdded = false;
wxString filenamesPassed; wxString filenamesPassed;
CountDragItems( (DragReference)m_currentDrag, &items ); CountDragItems( (DragReference)m_currentDrag, &items );
@ -262,7 +260,6 @@ bool wxDropTarget::GetData()
#endif #endif
case kDragFlavorTypeHFS: case kDragFlavorTypeHFS:
{
if (theData != NULL) if (theData != NULL)
{ {
HFSFlavor* theFile = (HFSFlavor*)theData; HFSFlavor* theFile = (HFSFlavor*)theData;
@ -271,7 +268,6 @@ bool wxDropTarget::GetData()
if (!name.IsEmpty()) if (!name.IsEmpty())
filenamesPassed += name + wxT("\n"); filenamesPassed += name + wxT("\n");
} }
}
break; break;
default: default:
@ -285,6 +281,7 @@ bool wxDropTarget::GetData()
} }
} }
} }
if (filenamesPassed.Len() > 0) if (filenamesPassed.Len() > 0)
{ {
wxCharBuffer buf = filenamesPassed.fn_str(); wxCharBuffer buf = filenamesPassed.fn_str();
@ -334,14 +331,13 @@ wxDragResult wxDropSource::DoDragDrop(int flags)
{ {
wxASSERT_MSG( m_data, wxT("Drop source: no data") ); wxASSERT_MSG( m_data, wxT("Drop source: no data") );
if (!m_data) if ((m_data == NULL) || (m_data->GetFormatCount() == 0))
return (wxDragResult) wxDragNone;
if (m_data->GetFormatCount() == 0)
return (wxDragResult)wxDragNone; return (wxDragResult)wxDragNone;
OSStatus result; OSStatus result;
DragReference theDrag; DragReference theDrag;
RgnHandle dragRegion; RgnHandle dragRegion;
if ((result = NewDrag( &theDrag )) != noErr) if ((result = NewDrag( &theDrag )) != noErr)
return wxDragNone; return wxDragNone;
@ -619,27 +615,20 @@ pascal OSErr wxMacWindowDragTrackingHandler(
{ {
if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) ) if ( !trackingGlobals->m_currentSource->MacInstallDefaultCursor( result ) )
{ {
int cursorID = wxCURSOR_NONE;
switch (result) switch (result)
{ {
case wxDragCopy: case wxDragCopy:
{ cursorID = wxCURSOR_COPY_ARROW;
wxCursor cursor(wxCURSOR_COPY_ARROW);
cursor.MacInstall();
}
break; break;
case wxDragMove: case wxDragMove:
{ cursorID = wxCURSOR_ARROW;
wxCursor cursor(wxCURSOR_ARROW);
cursor.MacInstall();
}
break; break;
case wxDragNone: case wxDragNone:
{ cursorID = wxCURSOR_NO_ENTRY;
wxCursor cursor(wxCURSOR_NO_ENTRY);
cursor.MacInstall();
}
break; break;
case wxDragError: case wxDragError:
@ -649,6 +638,12 @@ pascal OSErr wxMacWindowDragTrackingHandler(
// put these here to make gcc happy // put these here to make gcc happy
; ;
} }
if (cursorID != wxCURSOR_NONE)
{
wxCursor cursor( cursorID );
cursor.MacInstall();
}
} }
} }
} }