fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index bb3bc30971e280fd22ab4c55eda270fd8e4daf27..9f6f29d84e33b914ac0663d8bab173e0c7da1cd2 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -117,7 +117,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
     size_t indexFormats;
     size_t noOfFormats;
     wxDataFormat* formats;
     size_t indexFormats;
     size_t noOfFormats;
     wxDataFormat* formats;

-    
+

     noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get);
     formats = new wxDataFormat[noOfFormats];
     for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
     noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get);
     formats = new wxDataFormat[noOfFormats];
     for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)


@@ -126,7 +126,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
     delete[] formats;
    // do the same with the 'SET' direction:
     noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Set);
     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,
     formats = new wxDataFormat[noOfFormats];
     for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
       wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Set) == NULL,


@@ -195,10 +195,18 @@ void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
 
 #endif
 
 
 #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,
 }
 
 void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,


@@ -209,8 +217,11 @@ void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
 
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
 
     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);

     }
 }
 
     }
 }