Added switch and define for wxUSE_STD_STRING

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 9d665a3261fa27e10452c242e8dd9caa6b8d52cf..46abf008c29ce762568a1ec628babf2bac098f27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -420,6 +420,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_DEBUGREPORT=no
   DEFAULT_wxUSE_SNGLINST_CHECKER=no
   DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_STD_STRING=no
   DEFAULT_wxUSE_CMDLINE_PARSER=no
   DEFAULT_wxUSE_DATETIME=no
   DEFAULT_wxUSE_TIMER=no
@@ -615,6 +616,7 @@ else
   DEFAULT_wxUSE_DEBUGREPORT=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_STD_STRING=no
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
   DEFAULT_wxUSE_TIMER=yes
@@ -913,6 +915,7 @@ WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager],
 WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
 WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(std_string,    [  --enable-std_string     use standard C++ string classes], wxUSE_STD_STRING)
 WX_ARG_ENABLE(stdpaths,      [  --enable-stdpaths       use wxStandardPaths class], wxUSE_STDPATHS)
 WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
 WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
@@ -4890,6 +4893,10 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
   AC_DEFINE(wxUSE_STD_IOSTREAM)
 fi
 
+if test "$wxUSE_STD_STRING" = "yes"; then
+  AC_DEFINE(wxUSE_STD_STRING)
+fi
+
 if test "$wxUSE_STDPATHS" = "yes"; then
   AC_DEFINE(wxUSE_STDPATHS)
 fi

diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h
index f8ab507dfa01401921896e1d66ca1833e5cb850c..129a7c997a177e12860a1c0b41e7d1523eea9bf1 100644 (file)
--- a/include/wx/mac/setup0.h
+++ b/include/wx/mac/setup0.h
@@ -267,9 +267,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
+// Enable converion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 4580e4407df576394df6187a820782c5eeaa664b..3a37146aa05a1fbd7016c659f6861c0608112eef 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -266,9 +266,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
+// Enable converion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index c8dfa19da6a137ed41c36dba01208b4c4025307e..5cd390dfd4486561ae5e410eecc4928efae2c59e 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -266,9 +266,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
+// Enable converion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index a2f76c9f6f0d1c69f4ef4375c0f1765520fc38a1..56fc33e02e1a232998982e49dd27e5bf8b278455 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -251,9 +251,12 @@
 // If enabled (1), compiles wxWidgets streams classes
 #define wxUSE_STREAMS       1
 
-// Use standard C++ streams if 1. If 0, use wxWin streams implementation.
+// Use standard C++ streams if 1. If 0, use wxWin streams implementation only.
 #define wxUSE_STD_IOSTREAM  0
 
+// Enable converion to  standard C++ string if 1.
+#define wxUSE_STD_STRING  0
+
 // ----------------------------------------------------------------------------
 // non GUI features selection
 // ----------------------------------------------------------------------------

diff --git a/setup.h.in b/setup.h.in
index 50853facbee7c50a197033cf6bed2185748cc93e..e081e7205f70d30d1407efe43b793fed3e9a058e 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -204,6 +204,8 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
+#define wxUSE_STD_STRING  0
+
 
 #define wxUSE_LONGLONG      0