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
This commit is contained in:
parent
d3e0ffbcd0
commit
668d55c925
@ -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
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -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
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -204,6 +204,8 @@
|
||||
|
||||
#define wxUSE_STD_IOSTREAM 0
|
||||
|
||||
#define wxUSE_STD_STRING 0
|
||||
|
||||
|
||||
#define wxUSE_LONGLONG 0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user