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:
@@ -28,7 +28,7 @@ inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
|
||||
return wxStringSortAscending(s2, s1);
|
||||
}
|
||||
|
||||
#if wxUSE_STL
|
||||
#if wxUSE_STD_CONTAINERS
|
||||
|
||||
#include "wx/dynarray.h"
|
||||
|
||||
@@ -100,7 +100,7 @@ private:
|
||||
}
|
||||
};
|
||||
|
||||
#else // if !wxUSE_STL
|
||||
#else // if !wxUSE_STD_CONTAINERS
|
||||
|
||||
// this shouldn't be defined for compilers not supporting template methods or
|
||||
// without std::distance()
|
||||
@@ -384,7 +384,7 @@ public:
|
||||
{ Copy(array); }
|
||||
};
|
||||
|
||||
#endif // !wxUSE_STL
|
||||
#endif // !wxUSE_STD_CONTAINERS
|
||||
|
||||
// this class provides a temporary wxString* from a
|
||||
// wxArrayString
|
||||
|
Reference in New Issue
Block a user