Add wxUSE_STD_CONTAINERS and turn it on by default.
Previously, wxUSE_STL enabled both implicit conversion of wxString to std::[w]string and use of standard containers for the implementation of their wx equivalents. Split up the two roles now by allowing to enable the use of the standard containers independently of (backwards incompatible) implicit conversion in wxString and actually enable wxUSE_STD_CONTAINERS by default. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67343 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -13,12 +13,12 @@
|
||||
|
||||
#include "wx/vector.h"
|
||||
|
||||
#if wxUSE_STL
|
||||
#if wxUSE_STD_CONTAINERS
|
||||
|
||||
#include <stack>
|
||||
#define wxStack std::stack
|
||||
|
||||
#else // !wxUSE_STL
|
||||
#else // !wxUSE_STD_CONTAINERS
|
||||
|
||||
// Notice that unlike std::stack, wxStack currently always uses wxVector and
|
||||
// can't be used with any other underlying container type.
|
||||
@@ -53,7 +53,7 @@ private:
|
||||
container_type m_cont;
|
||||
};
|
||||
|
||||
#endif // wxUSE_STL/!wxUSE_STL
|
||||
#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS
|
||||
|
||||
|
||||
// Deprecated macro-based class for compatibility only, don't use any more.
|
||||
|
Reference in New Issue
Block a user