solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Replace some occurrences of wxUSE_STL with wxUSE_STD_CONTAINERS

Browse source 
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.
This commit is contained in:
Vadim Zeitlin 2023-04-15 15:14:41 +01:00
parent 4c8bf1e9e7
commit d65eed50fa
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/doxygen/mainpages/const_wxusedef.h
View file

@ -27,8 +27,9 @@ This table summarizes some of the global build features affecting the entire
library: library:
@beginDefList @beginDefList
@itemdef{wxUSE_STL, Container classes and wxString are implemented using @itemdef{wxUSE_STD_CONTAINERS, Container classes are implemented using
standard classes and provide the same standard API.} 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 @itemdef{wxUSE_UNICODE, Always defined as 1 in wxWidgets 3.3 and later, only
exists for compatibility.} exists for compatibility.}
@itemdef{wxUSE_UNICODE_WCHAR, wxString uses wchar_t buffer for internal storage @itemdef{wxUSE_UNICODE_WCHAR, wxString uses wchar_t buffer for internal storage

4
docs/msw/install.md
View file

@ -385,8 +385,8 @@ The full list of the build settings follows:
different setup.h settings coexisting in same tree. The value of different setup.h settings coexisting in same tree. The value of
this option is appended to the build directories names. This is this option is appended to the build directories names. This is
useful for building the library in some non-default configuration, 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 e.g. you could change `wxUSE_STD_CONTAINERS` to 0 in `%%WXWIN%\include\wx\msw\setup.h` and
then build with `CFG=-stl`. Alternatively, you could build with e.g. then build with `CFG=-nonstd`. Alternatively, you could build with e.g.
`RUNTIME_LIBS=static CFG=-mt` when using MSVC. `RUNTIME_LIBS=static CFG=-mt` when using MSVC.
* `COMPILER_PREFIX=<string>` * `COMPILER_PREFIX=<string>`

2
samples/propgrid/propgrid.cpp
View file

@ -1669,7 +1669,7 @@ void FormMain::PopulateWithLibraryConfig ()
ADD_WX_LIB_CONF_GROUP("Global Features") ADD_WX_LIB_CONF_GROUP("Global Features")
ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS ) ADD_WX_LIB_CONF( wxUSE_EXCEPTIONS )
ADD_WX_LIB_CONF( wxUSE_EXTENDED_RTTI ) 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_LOG )
ADD_WX_LIB_CONF( wxUSE_LOGWINDOW ) ADD_WX_LIB_CONF( wxUSE_LOGWINDOW )
ADD_WX_LIB_CONF( wxUSE_LOGGUI ) ADD_WX_LIB_CONF( wxUSE_LOGGUI )

2
tests/lists/lists.cpp
View file

@ -200,7 +200,7 @@ void ListsTestCase::wxListCtorTest()
CPPUNIT_ASSERT( list2.GetCount() == 2 ); CPPUNIT_ASSERT( list2.GetCount() == 2 );
CPPUNIT_ASSERT( Baz::GetNumber() == 2 ); CPPUNIT_ASSERT( Baz::GetNumber() == 2 );
#if !wxUSE_STL #if !wxUSE_STD_CONTAINERS
list1.DeleteContents(true); list1.DeleteContents(true);
#else #else
WX_CLEAR_LIST(wxListBazs, list1); WX_CLEAR_LIST(wxListBazs, list1);