From c82f9bcf7f14f903b984022de5aebd96790b1f7c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 13 Jul 2010 11:33:03 +0000 Subject: [PATCH] Revert the wxDataObjectComposite checks added by r58549. 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 --- src/common/dobjcmn.cpp | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp index 9f6f29d84e..271144ee76 100644 --- a/src/common/dobjcmn.cpp +++ b/src/common/dobjcmn.cpp @@ -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; indexFormatsGetObject(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; indexFormatsGetObject(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 ); } -- 2.45.2