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
setup.h.in
13
setup.h.in
@@ -189,8 +189,6 @@
|
||||
|
||||
#define wxUSE_EXTENDED_RTTI 0
|
||||
|
||||
#define wxUSE_STL 0
|
||||
|
||||
#define wxUSE_LOG 0
|
||||
|
||||
#define wxUSE_LOGWINDOW 0
|
||||
@@ -205,6 +203,12 @@
|
||||
|
||||
#define wxUSE_STREAMS 0
|
||||
|
||||
#define wxUSE_PRINTF_POS_PARAMS 0
|
||||
|
||||
|
||||
|
||||
#define wxUSE_STL 0
|
||||
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|| (defined(_MSC_VER) && _MSC_VER < 1200)
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
@@ -212,11 +216,14 @@
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
|
||||
|
||||
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
|
||||
|
||||
#define wxUSE_STD_STRING wxUSE_STD_DEFAULT
|
||||
|
||||
#define wxUSE_PRINTF_POS_PARAMS 0
|
||||
#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
|
||||
|
||||
|
||||
|
||||
#define wxUSE_LONGLONG 0
|
||||
|
Reference in New Issue
Block a user