Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason of recents modifications to wxDataObjectComposite (closes #10430)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59395 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-03-06 23:42:06 +00:00
parent d02852036d
commit 9113ffaf56
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/common/dobjcmn.cpp
View File

@@ -117,7 +117,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
size_t indexFormats; size_t indexFormats;
size_t noOfFormats; size_t noOfFormats;
wxDataFormat* formats; wxDataFormat* formats;
noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get); noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Get);
formats = new wxDataFormat[noOfFormats]; formats = new wxDataFormat[noOfFormats];
for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats) for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
@@ -126,7 +126,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
delete[] formats; delete[] formats;
// do the same with the 'SET' direction: // do the same with the 'SET' direction:
noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Set); noOfFormats = dataObject->GetFormatCount(wxDataObjectBase::Set);
formats = new wxDataFormat[noOfFormats]; formats = new wxDataFormat[noOfFormats];
for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats) for (indexFormats=0; indexFormats<noOfFormats; ++indexFormats)
wxCHECK_RET(this->GetObject(formats[indexFormats],wxDataObjectBase::Set) == NULL, 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? size_t n = 0;
return m_dataObjects.GetCount();
// 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); // NOTE: some wxDataObjectSimple objects may return more than 1 format
index += node->GetData()->GetFormatCount(dir); // 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);
} }
} }