From bb445ba73277eaed18c2fbb6c4714279bdff8bdb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 16 Feb 2008 15:40:13 +0000 Subject: [PATCH] turn wxUSE_STD_IOSTREAM on by default (except for the compilers which are too broken) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51844 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mac/setup0.h | 33 ++++++++++++++++++++------------- include/wx/motif/setup0.h | 33 ++++++++++++++++++++------------- include/wx/msw/setup0.h | 33 ++++++++++++++++++++------------- include/wx/msw/wince/setup.h | 33 ++++++++++++++++++++------------- include/wx/os2/setup0.h | 33 ++++++++++++++++++++------------- include/wx/palmos/setup0.h | 33 ++++++++++++++++++++------------- include/wx/setup_inc.h | 33 ++++++++++++++++++++------------- include/wx/univ/setup0.h | 33 ++++++++++++++++++++------------- 8 files changed, 160 insertions(+), 104 deletions(-) diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index de3bd675ec..db5d625263 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -256,6 +256,22 @@ // 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. @@ -268,24 +284,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 55631e9d9f..36232e736a 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -255,6 +255,22 @@ // 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. @@ -267,24 +283,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index dc45efdd16..bf8aecd3ce 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -255,6 +255,22 @@ // 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. @@ -267,24 +283,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h index 98c18229e6..0cbfc727d2 100644 --- a/include/wx/msw/wince/setup.h +++ b/include/wx/msw/wince/setup.h @@ -255,6 +255,22 @@ // 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. @@ -267,24 +283,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index eea4f59b55..b41a448949 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -255,6 +255,22 @@ // 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. @@ -267,24 +283,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h index cf8547e8e1..529faf34ee 100644 --- a/include/wx/palmos/setup0.h +++ b/include/wx/palmos/setup0.h @@ -255,6 +255,22 @@ // 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. @@ -267,24 +283,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 44a5fbb79c..f83f0ceaf3 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -251,6 +251,22 @@ // 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. @@ -263,24 +279,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 4b693ac864..d9824509ee 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -254,6 +254,22 @@ // 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. @@ -266,24 +282,15 @@ // 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 0 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// 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 -- 2.45.2