Added --use-stl to cnfigure, wxUSE_STL to setup0.h
Moved wx/datetime.inl contents to wx/datetime.h and removed inline redefinition hack. Implemented STL-like interface on top of wxList/wxArray, when wxUSE_STL=0. Implemented wxList-like and wxArray interfaces on top of std::list and std::vector, when wxUSE_STL=1. Added arrstr.h, moved wxArrayString declaration there; string.h #includes arrstr.h only if WXWIN_COMPATIBILITY_2_4 is enabled. Added WX_CLEAR_HASH_MAP, WX_CLEAR_HASH_TABLE, WX_CLEAR_LIST macros, to clear a wxHashMap, wxHashTable, wxList containing pointers: deletes pointers and makes container zero-sized. When wxUSE_STL=1, wxStringList works like a std::list<wxString>. Made wxBase compile when wxUSE_STL=1. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21768 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -330,6 +330,7 @@ dnl usage
|
||||
DEBUG_CONFIGURE=0
|
||||
if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
DEFAULT_wxUSE_STL=no
|
||||
|
||||
DEFAULT_wxUSE_NANOX=no
|
||||
|
||||
@@ -504,6 +505,7 @@ if test $DEBUG_CONFIGURE = 1; then
|
||||
DEFAULT_wxUSE_MONOLITHIC=yes
|
||||
else
|
||||
DEFAULT_wxUSE_UNIVERSAL=no
|
||||
DEFAULT_wxUSE_STL=no
|
||||
|
||||
DEFAULT_wxUSE_NANOX=no
|
||||
|
||||
@@ -744,6 +746,7 @@ dnl ---------------------------------------------------------------------------
|
||||
WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED)
|
||||
WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE)
|
||||
WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG)
|
||||
WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
|
||||
|
||||
dnl allow the precompiled header option to be disabled under Mac OS X/Darwin
|
||||
WX_ARG_ENABLE(precomp, [ --enable-precomp enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP)
|
||||
@@ -4148,6 +4151,10 @@ dnl ---------------------------------------------------------------------------
|
||||
dnl Register non-GUI class options for makefiles and setup.h
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
if test "$wxUSE_STL" = "yes"; then
|
||||
AC_DEFINE(wxUSE_STL)
|
||||
fi
|
||||
|
||||
if test "$wxUSE_APPLE_IEEE" = "yes"; then
|
||||
AC_DEFINE(wxUSE_APPLE_IEEE)
|
||||
fi
|
||||
|
Reference in New Issue
Block a user