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:
@@ -299,6 +299,22 @@
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_SOCKETS) */
|
||||
|
||||
#ifndef wxUSE_STD_CONTAINERS
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_STD_CONTAINERS must be defined, please read comment near the top of this file."
|
||||
# else
|
||||
# define wxUSE_STD_CONTAINERS 0
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_STD_CONTAINERS) */
|
||||
|
||||
#ifndef wxUSE_STD_STRING_CONV_IN_WXSTRING
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_STD_STRING_CONV_IN_WXSTRING must be defined, please read comment near the top of this file."
|
||||
# else
|
||||
# define wxUSE_STD_STRING_CONV_IN_WXSTRING 0
|
||||
# endif
|
||||
#endif /* !defined(wxUSE_STD_STRING_CONV_IN_WXSTRING) */
|
||||
|
||||
#ifndef wxUSE_STREAMS
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_STREAMS must be defined, please read comment near the top of this file."
|
||||
|
Reference in New Issue
Block a user