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:
parent
693bfcafb6
commit
8bb9d852a3
@ -273,7 +273,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
|
||||
|
@ -272,7 +272,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
|
||||
|
@ -272,7 +272,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
|
||||
|
@ -272,7 +272,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
|
||||
|
@ -272,7 +272,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
|
||||
|
@ -272,7 +272,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
|
||||
|
@ -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
|
||||
|
@ -169,17 +169,6 @@ inline int Stricmp(const char *psz1, const char *psz2)
|
||||
// deal with STL/non-STL/non-STL-but-wxUSE_STD_STRING
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#if wxUSE_STL || wxUSE_STD_STRING
|
||||
// these compilers come without standard C++ library headers by default,
|
||||
// remove the tests here if you do have them (e.g. from STLPort)
|
||||
#if defined(__DMC__) || defined(__WATCOMC__)
|
||||
#undef wxUSE_STL
|
||||
#undef wxUSE_STD_STRING
|
||||
#define wxUSE_STL 0
|
||||
#define wxUSE_STD_STRING 0
|
||||
#endif
|
||||
#endif // wxUSE_STL || wxUSE_STD_STRING
|
||||
|
||||
// in both cases we need to define wxStdString
|
||||
#if wxUSE_STL || wxUSE_STD_STRING
|
||||
|
||||
|
@ -258,6 +258,23 @@
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
#endif
|
||||
|
||||
// Enable conversion to standard C++ string if 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
|
||||
// parameters, setting this to 1 forces the use of the wxWidgets implementation
|
||||
|
@ -203,7 +203,12 @@
|
||||
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
#define wxUSE_STD_STRING 0
|
||||
#if defined(__DMC__) || defined(__WATCOMC__) \
|
||||
|| (defined(_MSC_VER) && _MSC_VER < 1200)
|
||||
#define wxUSE_STD_STRING 0
|
||||
#else
|
||||
#define wxUSE_STD_STRING 0
|
||||
#endif
|
||||
|
||||
#define wxUSE_PRINTF_POS_PARAMS 0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user