Move the #if disabling wxUSE_STD_STRING for watcom/dmc/vc5 into setup.h so

that users can edit them easily.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43179 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-11-08 00:09:15 +00:00
parent 693bfcafb6
commit 8bb9d852a3
10 changed files with 128 additions and 19 deletions

View File

@@ -268,7 +268,21 @@
#define wxUSE_STD_IOSTREAM 0
// Enable conversion to standard C++ string if 1.
#define wxUSE_STD_STRING 1
//
// Default is 1 for most compilers.
//
// 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 header, 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_STRING 0
#else
#define wxUSE_STD_STRING 1
#endif
// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
// Note that if the system's implementation does not support positional