Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert the wxDataObjectComposite checks added by r58549.

Browse Source 
The checks for data format duplication in wxDataObjectComposite::Add() added
by this revision were broken and didn't actually check anything. It also
doesn't seem clear why do we need them at all so simply remove them. See #10437
for more details.

This also closes #12113 as a side effect because the messages are not present
any more.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64933 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-07-13 11:33:03 +00:00
parent 4285c53fac
commit c82f9bcf7f
1 changed files with 1 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/dobjcmn.cpp
View File

@@ -111,31 +111,9 @@ wxDataObjectComposite::GetObject(const wxDataFormat& format, wxDataObjectBase::D
void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
{
// check if the data format of the passed object already exists in the composite data object, if this is the case
// do not add the data object and display a message in debug mode (otherwise this method fails silently):
// start checking if the data format exists for the 'GET' direction:
size_t indexFormats;
size_t noOfFormats;
wxDataFormat* formats;
noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get);
formats = new wxDataFormat[noOfFormats];
for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Get) == NULL,
_("The data format for the GET-direction of the to be added data object already exists"));
delete[] formats;
// do the same with the 'SET' direction:
noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Set);
formats = new wxDataFormat[noOfFormats];
for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Set) == NULL,
_("The data format for the SET-direction of the to be added data object already exists"));
delete[] formats;
// if we reach this location the data object can simply be appended:
if ( preferred )
m_preferred = m_dataObjects.GetCount();
m_dataObjects.Append( dataObject );
}