Add wxList::AsVector<>() helper.
This can be useful in legacy code using wxList to progressively replace it with wxVector. See #14814. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73003 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -644,6 +644,7 @@ All:
|
|||||||
- Added wxDir::GetNameWithSep().
|
- Added wxDir::GetNameWithSep().
|
||||||
- Allow unloading wxPluginLibrary objects in any order (manyleaves).
|
- Allow unloading wxPluginLibrary objects in any order (manyleaves).
|
||||||
- Fix passing strings with embedded NULs in wxThreadEvents (Steffen Olszewski).
|
- Fix passing strings with embedded NULs in wxThreadEvents (Steffen Olszewski).
|
||||||
|
- Add wxList::AsVector<>() helper (troelsk).
|
||||||
|
|
||||||
All (GUI):
|
All (GUI):
|
||||||
|
|
||||||
|
@@ -32,6 +32,7 @@
|
|||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
#include "wx/object.h"
|
#include "wx/object.h"
|
||||||
#include "wx/string.h"
|
#include "wx/string.h"
|
||||||
|
#include "wx/vector.h"
|
||||||
|
|
||||||
#if wxUSE_STD_CONTAINERS
|
#if wxUSE_STD_CONTAINERS
|
||||||
#include "wx/beforestd.h"
|
#include "wx/beforestd.h"
|
||||||
@@ -1215,6 +1216,23 @@ public:
|
|||||||
// compatibility methods
|
// compatibility methods
|
||||||
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
|
void Sort(wxSortCompareFunction compfunc) { wxListBase::Sort(compfunc); }
|
||||||
#endif // !wxUSE_STD_CONTAINERS
|
#endif // !wxUSE_STD_CONTAINERS
|
||||||
|
|
||||||
|
#ifndef __VISUALC6__
|
||||||
|
template<typename T>
|
||||||
|
wxVector<T> AsVector() const
|
||||||
|
{
|
||||||
|
wxVector<T> vector(size());
|
||||||
|
size_t i = 0;
|
||||||
|
|
||||||
|
for ( const_iterator it = begin(); it != end(); ++it )
|
||||||
|
{
|
||||||
|
vector[i++] = static_cast<T>(*it);
|
||||||
|
}
|
||||||
|
|
||||||
|
return vector;
|
||||||
|
}
|
||||||
|
#endif // !__VISUALC6__
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#if !wxUSE_STD_CONTAINERS
|
#if !wxUSE_STD_CONTAINERS
|
||||||
|
@@ -391,6 +391,13 @@ public:
|
|||||||
Returns the size of the list.
|
Returns the size of the list.
|
||||||
*/
|
*/
|
||||||
size_type size() const;
|
size_type size() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
Returns a wxVector holding the list elements.
|
||||||
|
|
||||||
|
@since 2.9.5
|
||||||
|
*/
|
||||||
|
wxVector<T> AsVector() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user