X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f453d7eadaf93af1d84981a1d1ead8e04be9522f..34b239ec5d9c20a78adaa2dd680bd482b43a68f7:/src/common/dobjcmn.cpp

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index bb3bc30971..f019177524 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; 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 );
 }
 
@@ -195,10 +173,18 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
 
 #endif
 
-size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
+size_t wxDataObjectComposite::GetFormatCount(Direction dir) const
 {
-    // TODO what about the Get/Set only formats?
-    return m_dataObjects.GetCount();
+    size_t n = 0;
+
+    // NOTE: some wxDataObjectSimple objects may return a number greater than 1
+    //       from GetFormatCount(): this is the case of e.g. wxTextDataObject
+    //       under wxMac and wxGTK
+    wxSimpleDataObjectList::compatibility_iterator node;
+    for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
+        n += node->GetData()->GetFormatCount(dir);
+
+    return n;
 }
 
 void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
@@ -209,8 +195,11 @@ void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
 
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
-      node->GetData()->GetAllFormats(formats+index,dir);
-      index += node->GetData()->GetFormatCount(dir);
+        // NOTE: some wxDataObjectSimple objects may return more than 1 format
+        //       from GetAllFormats(): this is the case of e.g. wxTextDataObject
+        //       under wxMac and wxGTK
+        node->GetData()->GetAllFormats(formats+index, dir);
+        index += node->GetData()->GetFormatCount(dir);
     }
 }
 
@@ -366,22 +355,22 @@ bool wxTextDataObject::SetData(const wxDataFormat& format,
 
 #elif defined(wxNEEDS_UTF16_FOR_TEXT_DATAOBJ)
 
-static wxMBConvUTF16 sUTF16Converter;
+namespace
+{
 
-static inline wxMBConv& GetConv(const wxDataFormat& format)
+inline wxMBConv& GetConv(const wxDataFormat& format)
 {
-    return
-        format == wxDF_UNICODETEXT
-        ? (wxMBConv&) sUTF16Converter
-        : (wxMBConv&) wxConvLocal;
+    static wxMBConvUTF16 s_UTF16Converter;
+
+    return format == wxDF_UNICODETEXT ? static_cast<wxMBConv&>(s_UTF16Converter)
+                                      : static_cast<wxMBConv&>(wxConvLocal);
 }
 
+} // anonymous namespace
+
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 {
-    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
-    len += (format == wxDF_UNICODETEXT ? 2 : 1);
-
-    return len;
+    return GetConv(format).WC2MB(NULL, GetText().wc_str(), 0);
 }
 
 bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
@@ -389,26 +378,21 @@ bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
     if ( buf == NULL )
         return false;
 
-    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
-
-    size_t len = GetConv(format).WC2MB( NULL, GetText().c_str(), 0 );
-    len += (format == wxDF_UNICODETEXT ? 2 : 1);
+    wxCharBuffer buffer(GetConv(format).cWX2MB(GetText().c_str()));
 
-    // trailing (uni)char 0
-    memcpy( (char*)buf, (const char*)buffer, len );
+    memcpy(buf, buffer.data(), buffer.length());
 
     return true;
 }
 
 bool wxTextDataObject::SetData(const wxDataFormat& format,
-                               size_t WXUNUSED(len), const void *buf)
+                               size_t WXUNUSED(len),
+                               const void *buf)
 {
     if ( buf == NULL )
         return false;
 
-    wxWCharBuffer buffer = GetConv(format).cMB2WX( (const char*)buf );
-
-    SetText( buffer );
+    SetText(GetConv(format).cMB2WX(static_cast<const char*>(buf)));
 
     return true;
 }