Remove functions duplicated in dnd_osx.cpp.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2010-02-09 01:24:22 +00:00
parent 1ed7a2064a
commit aa48d3053d

View File

@@ -58,94 +58,6 @@ wxDropTarget::wxDropTarget( wxDataObject *data )
wxMacEnsureTrackingHandlersInstalled();
}
bool wxDropTarget::CurrentDragHasSupportedFormat()
{
bool supported = false;
if (m_dataObject == NULL)
return false;
if ( gTrackingGlobals.m_currentSource != NULL )
{
wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject();
if ( data )
{
size_t formatcount = data->GetFormatCount();
wxDataFormat *array = new wxDataFormat[formatcount];
data->GetAllFormats( array );
for (size_t i = 0; !supported && i < formatcount; i++)
{
wxDataFormat format = array[i];
if ( m_dataObject->IsSupported( format ) )
{
supported = true;
break;
}
}
delete [] array;
}
}
if ( !supported )
{
supported = m_dataObject->HasDataInPasteboard( m_currentDragPasteboard );
}
return supported;
}
bool wxDropTarget::GetData()
{
if (m_dataObject == NULL)
return false;
if ( !CurrentDragHasSupportedFormat() )
return false;
bool transferred = false;
if ( gTrackingGlobals.m_currentSource != NULL )
{
wxDataObject* data = gTrackingGlobals.m_currentSource->GetDataObject();
if (data != NULL)
{
size_t formatcount = data->GetFormatCount();
wxDataFormat *array = new wxDataFormat[formatcount];
data->GetAllFormats( array );
for (size_t i = 0; !transferred && i < formatcount; i++)
{
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;
}
}
if ( !transferred )
{
transferred = m_dataObject->GetFromPasteboard( m_currentDragPasteboard );
}
return transferred;
}
//-------------------------------------------------------------------------
// wxDropSource