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

added protection against non-file drop targets receiving files (and subsequently crashing)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37351 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell 2006-02-06 16:24:26 +00:00
parent 26c2a266cd
commit 63c6e6c806
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,26 +245,34 @@ bool wxDropTarget::GetData()
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 + 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 )
{
// reset file list
((wxFileDataObject*)m_dataObject)->SetData( 0 , "" ) ;
firstFileAdded = true ;
}
wxFileDataObject *fdo = dynamic_cast<wxFileDataObject*>(m_dataObject);
wxASSERT( fdo != NULL );
((wxFileDataObject*)m_dataObject)->AddFile( name ) ;
if ((theData != NULL) && (fdo != NULL))
{
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 ) ;
}
}
else
{