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

Use vector instead of array of wxDataFormats

Browse Source 
Also rename EnableDropTarget() to EnableDropTargets(), as calling
EnableDropTarget(wxDF_XXX) would be ambiguous due to the existence of a
non-explicit wxVector ctor taking size_t (which is a mistake on its own,
but is probably not worth changing any more).
This commit is contained in:
Vadim Zeitlin
2021-08-16 18:22:08 +02:00
parent 1499d7d45b
commit cd555f9ff5
11 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/datavcmn.cpp
View File

@@ -1690,17 +1690,17 @@ void wxDataViewCtrlBase::StartEditor(const wxDataViewItem& item, unsigned int co
#if wxUSE_DRAG_AND_DROP
wxDataObject* wxDataViewCtrlBase::CreateDataObject(const wxDataFormatArray& formats)
wxDataObject* wxDataViewCtrlBase::CreateDataObject(const wxVector<wxDataFormat>& formats)
{
if (formats.GetCount() == 0)
if (formats.empty())
{
return NULL;
}
wxDataObjectComposite *dataObject(new wxDataObjectComposite);
for (size_t i = 0; i < formats.GetCount(); ++i)
for (size_t i = 0; i < formats.size(); ++i)
{
switch (formats.Item(i).GetType())
switch (formats[i].GetType())
{
case wxDF_TEXT:
case wxDF_OEMTEXT:
@@ -1733,7 +1733,7 @@ wxDataObject* wxDataViewCtrlBase::CreateDataObject(const wxDataFormatArray& form
case wxDF_ENHMETAFILE:
case wxDF_LOCALE:
case wxDF_PRIVATE:
dataObject->Add(new wxCustomDataObject(formats.Item(i)));
dataObject->Add(new wxCustomDataObject(formats[i]));
break;
case wxDF_INVALID: