diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index df021af849..4929160986 100644
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -183,14 +183,15 @@ size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
 }
 
 void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
-                                          Direction WXUNUSED(dir)) const
+                                          Direction dir) const
 {
-    size_t n = 0;
+    size_t index(0);
     wxSimpleDataObjectList::compatibility_iterator node;
+
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
-        // TODO if ( !outputOnlyToo ) && this one counts ...
-        formats[n++] = node->GetData()->GetFormat();
+      node->GetData()->GetAllFormats(formats+index,dir);
+      index += node->GetData()->GetFormatCount(dir);
     }
 }