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:
Vadim Zeitlin
@@ -200,15 +200,6 @@
|
||||
// Recommended setting: 0 (this is still work in progress...)
|
||||
#define wxUSE_EXTENDED_RTTI 0
|
||||
|
||||
// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from
|
||||
// std::list<Foo*> and std::vector<Foo*>, with a compatibility interface,
|
||||
// and for wxHashMap to be implemented with templates.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: YMMV
|
||||
#define wxUSE_STL 0
|
||||
|
||||
// Support for message/error logging. This includes wxLogXXX() functions and
|
||||
// wxLog and derived classes. Don't set this to 0 unless you really know what
|
||||
// you are doing.
|
||||
@@ -260,44 +251,6 @@
|
||||
// Recommended setting: 1 as setting it to 0 disables many other things
|
||||
#define wxUSE_STREAMS 1
|
||||
|
||||
// This is not a real option but is used as the default value for
|
||||
// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING.
|
||||
//
|
||||
// Currently the Digital Mars and Watcom compilers come without standard C++
|
||||
// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
|
||||
// them (e.g. from STLPort).
|
||||
//
|
||||
// VC++ 5.0 does include standard C++ library headers, however they produce
|
||||
// many warnings that can't be turned off when compiled at warning level 4.
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|| (defined(_MSC_VER) && _MSC_VER < 1200)
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
#else
|
||||
#define wxUSE_STD_DEFAULT 1
|
||||
#endif
|
||||
|
||||
// Use standard C++ streams if 1 instead of wx streams in some places. If
|
||||
// disabled (default), wx streams are used everywhere and wxWidgets doesn't
|
||||
// depend on the standard streams library.
|
||||
//
|
||||
// Notice that enabling this does not replace wx streams with std streams
|
||||
// everywhere, in a lot of places wx streams are used no matter what.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 1 if you use the standard streams anyhow and so
|
||||
// dependency on the standard streams library is not a
|
||||
// problem
|
||||
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
|
||||
|
||||
// Enable conversion to standard C++ string if 1.
|
||||
//
|
||||
// Default is 1 for most compilers.
|
||||
//
|
||||
// Recommended setting: 1 unless you want to ensure your program doesn't use
|
||||
// the standard C++ library at all.
|
||||
#define wxUSE_STD_STRING wxUSE_STD_DEFAULT
|
||||
|
||||
// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
|
||||
// Note that if the system's implementation does not support positional
|
||||
// parameters, setting this to 1 forces the use of the wxWidgets implementation
|
||||
@@ -313,6 +266,89 @@
|
||||
// Recommended setting: 1 if you want to support multiple languages
|
||||
#define wxUSE_PRINTF_POS_PARAMS 1
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Interoperability with the standard library.
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
|
||||
// library, even at the cost of backwards compatibility.
|
||||
//
|
||||
// Default is 0
|
||||
//
|
||||
// Recommended setting: 0 as the options below already provide a relatively
|
||||
// good level of interoperability and changing this option arguably isn't worth
|
||||
// diverging from the official builds of the library.
|
||||
#define wxUSE_STL 0
|
||||
|
||||
// This is not a real option but is used as the default value for
|
||||
// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
|
||||
//
|
||||
// Currently the Digital Mars and Watcom compilers come without standard C++
|
||||
// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
|
||||
// them (e.g. from STLPort).
|
||||
//
|
||||
// VC++ 5.0 does include standard C++ library headers, however they produce
|
||||
// many warnings that can't be turned off when compiled at warning level 4.
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|| (defined(_MSC_VER) && _MSC_VER < 1200)
|
||||
#define wxUSE_STD_DEFAULT 0
|
||||
#else
|
||||
#define wxUSE_STD_DEFAULT 1
|
||||
#endif
|
||||
|
||||
// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
|
||||
// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
|
||||
// usually more limited) implementations are used which allows to avoid the
|
||||
// dependency on the C++ run-time library.
|
||||
//
|
||||
// Default is 1 if compiler supports it.
|
||||
//
|
||||
// Recommended setting: 1 unless you use a system without good implementation
|
||||
// of STL.
|
||||
#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
|
||||
|
||||
// Use standard C++ streams if 1 instead of wx streams in some places. If
|
||||
// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
|
||||
// standard streams library.
|
||||
//
|
||||
// Notice that enabling this does not replace wx streams with std streams
|
||||
// everywhere, in a lot of places wx streams are used no matter what.
|
||||
//
|
||||
// Default is 1 if compiler supports it.
|
||||
//
|
||||
// Recommended setting: 1 if you use the standard streams anyhow and so
|
||||
// dependency on the standard streams library is not a
|
||||
// problem
|
||||
#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT
|
||||
|
||||
// Enable minimal interoperability with the standard C++ string class if 1.
|
||||
// "Minimal" means that wxString can be constructed from std::string or
|
||||
// std::wstring but can't be implicitly converted to them. You need to enable
|
||||
// the option below for the latter.
|
||||
//
|
||||
// Default is 1 for most compilers.
|
||||
//
|
||||
// Recommended setting: 1 unless you want to ensure your program doesn't use
|
||||
// the standard C++ library at all.
|
||||
#define wxUSE_STD_STRING wxUSE_STD_DEFAULT
|
||||
|
||||
// Make wxString as much interchangeable with std::[w]string as possible, in
|
||||
// particular allow implicit conversion of wxString to either of these classes.
|
||||
// This comes at a price (or a benefit, depending on your point of view) of not
|
||||
// allowing implicit conversion to "const char *" and "const wchar_t *".
|
||||
//
|
||||
// Because a lot of existing code relies on these conversions, this option is
|
||||
// disabled by default but can be enabled for your build if you don't care
|
||||
// about compatibility.
|
||||
//
|
||||
// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
|
||||
//
|
||||
// Recommended setting: 0 to remain compatible with the official builds of
|
||||
// wxWidgets.
|
||||
#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// non GUI features selection
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user