From: Robert Roebling Date: Sat, 31 Jan 2009 13:36:32 +0000 (+0000) Subject: Fixes #10432 (wxDataObjectComposite::GetAllFormats() does not work) X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/0dd48109b4d2983fe600b3faf260b31cb82353c4 Fixes #10432 (wxDataObjectComposite::GetAllFormats() does not work) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58548 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- 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); } }