From d65eed50fae43e1deac68da29f7ac66c34211b74 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 15 Apr 2023 15:14:41 +0100 Subject: [PATCH] Replace some occurrences of wxUSE_STL with wxUSE_STD_CONTAINERS The latter option will remain, while the former one won't be used at all any longer soon, so prefer using the latter whenever possible. --- docs/doxygen/mainpages/const_wxusedef.h | 5 +++-- docs/msw/install.md | 4 ++-- samples/propgrid/propgrid.cpp | 2 +- tests/lists/lists.cpp | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/doxygen/mainpages/const_wxusedef.h b/docs/doxygen/mainpages/const_wxusedef.h index b26dd9b977..0353ab916f 100644 --- a/docs/doxygen/mainpages/const_wxusedef.h +++ b/docs/doxygen/mainpages/const_wxusedef.h @@ -27,8 +27,9 @@ This table summarizes some of the global build features affecting the entire library: @beginDefList -@itemdef{wxUSE_STL, Container classes and wxString are implemented using - standard classes and provide the same standard API.} +@itemdef{wxUSE_STD_CONTAINERS, Container classes are implemented using + standard classes (while still providing some compatibility with legacy + wxWidgets container classes).} @itemdef{wxUSE_UNICODE, Always defined as 1 in wxWidgets 3.3 and later, only exists for compatibility.} @itemdef{wxUSE_UNICODE_WCHAR, wxString uses wchar_t buffer for internal storage diff --git a/docs/msw/install.md b/docs/msw/install.md index c80deae208..cab3ccdb07 100644 --- a/docs/msw/install.md +++ b/docs/msw/install.md @@ -385,8 +385,8 @@ The full list of the build settings follows: different setup.h settings coexisting in same tree. The value of this option is appended to the build directories names. This is useful for building the library in some non-default configuration, - e.g. you could change `wxUSE_STL` to 1 in `%%WXWIN%\include\wx\msw\setup.h` and - then build with `CFG=-stl`. Alternatively, you could build with e.g. + e.g. you could change `wxUSE_STD_CONTAINERS` to 0 in `%%WXWIN%\include\wx\msw\setup.h` and + then build with `CFG=-nonstd`. Alternatively, you could build with e.g. `RUNTIME_LIBS=static CFG=-mt` when using MSVC. * `COMPILER_PREFIX=` diff --git a/samples/propgrid/propgrid.cpp b/samples/propgrid/propgrid.cpp index c106b4bb0f..7b423ca2d7 100644 --- a/samples/propgrid/propgrid.cpp +++ b/samples/propgrid/propgrid.cpp @@ -1669,7 +1669,7 @@ void FormMain::PopulateWithLibraryConfig () ADD_WX_LIB_CONF_GROUP("Global Features") ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS ) ADD_WX_LIB_CONF( wxUSE_EXTENDED_RTTI ) - ADD_WX_LIB_CONF( wxUSE_STL ) + ADD_WX_LIB_CONF( wxUSE_STD_CONTAINERS ) ADD_WX_LIB_CONF( wxUSE_LOG ) ADD_WX_LIB_CONF( wxUSE_LOGWINDOW ) ADD_WX_LIB_CONF( wxUSE_LOGGUI ) diff --git a/tests/lists/lists.cpp b/tests/lists/lists.cpp index 7f2ff588ec..eb8e886086 100644 --- a/tests/lists/lists.cpp +++ b/tests/lists/lists.cpp @@ -200,7 +200,7 @@ void ListsTestCase::wxListCtorTest() CPPUNIT_ASSERT( list2.GetCount() == 2 ); CPPUNIT_ASSERT( Baz::GetNumber() == 2 ); -#if !wxUSE_STL +#if !wxUSE_STD_CONTAINERS list1.DeleteContents(true); #else WX_CLEAR_LIST(wxListBazs, list1);