X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f75d778149f7595377d50d3dd275296743980689..7a5a5718592cb0873374e6ebc66d12a153d5acea:/include/wx/build.h diff --git a/include/wx/build.h b/include/wx/build.h index 3c926f3c18..833807da0c 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -52,16 +52,6 @@ #endif // WXWIN_COMPATIBILITY macros affect presence of virtual functions -#if WXWIN_COMPATIBILITY - #define __WX_BO_WXWIN_COMPAT_1_68 ",compatible with 1.68" -#else - #define __WX_BO_WXWIN_COMPAT_1_68 -#endif -#if WXWIN_COMPATIBILITY_2 - #define __WX_BO_WXWIN_COMPAT_2_0 ",compatible with 2.0" -#else - #define __WX_BO_WXWIN_COMPAT_2_0 -#endif #if WXWIN_COMPATIBILITY_2_2 #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2" #else @@ -73,13 +63,19 @@ #define __WX_BO_WXWIN_COMPAT_2_4 #endif - +// deriving wxWin containers from STL ones changes them completely: +#if wxUSE_STL + #define __WX_BO_STL ",STL containers" +#else + #define __WX_BO_STL ",wx containers" +#endif + // This macro is passed as argument to wxConsoleApp::CheckBuildOptions() #define WX_BUILD_OPTIONS_SIGNATURE \ __WX_BO_VERSION(wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER) \ " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \ __WX_BO_COMPILER \ - __WX_BO_WXWIN_COMPAT_1_68 __WX_BO_WXWIN_COMPAT_2_0 \ + __WX_BO_STL \ __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \ ")"