X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dee1a63ff52bfe4da396187f8438aa1a29796737..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/build.h diff --git a/include/wx/build.h b/include/wx/build.h index f0cebe2087..5141afcbc7 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -77,16 +77,16 @@ #endif // WXWIN_COMPATIBILITY macros affect presence of virtual functions -#if WXWIN_COMPATIBILITY_2_4 - #define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4" -#else - #define __WX_BO_WXWIN_COMPAT_2_4 -#endif #if WXWIN_COMPATIBILITY_2_6 #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6" #else #define __WX_BO_WXWIN_COMPAT_2_6 #endif +#if WXWIN_COMPATIBILITY_2_8 + #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8" +#else + #define __WX_BO_WXWIN_COMPAT_2_8 +#endif // deriving wxWin containers from STL ones changes them completely: #if wxUSE_STL @@ -101,7 +101,7 @@ " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \ __WX_BO_COMPILER \ __WX_BO_STL \ - __WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 \ + __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \ ")" @@ -122,28 +122,4 @@ } gs_buildOptionsCheck; -#if WXWIN_COMPATIBILITY_2_4 - -// ---------------------------------------------------------------------------- -// wxBuildOptions -// ---------------------------------------------------------------------------- - -// NB: Don't use this class in new code, it relies on the ctor being always -// inlined. WX_BUILD_OPTIONS_SIGNATURE always works. -class wxBuildOptions -{ -public: - // the ctor must be inline to get the compilation settings of the code - // which included this header - wxBuildOptions() : m_signature(WX_BUILD_OPTIONS_SIGNATURE) {} - -private: - const char *m_signature; - - // actually only CheckBuildOptions() should be our friend but well... - friend class wxAppConsole; -}; - -#endif // WXWIN_COMPATIBILITY_2_4 - #endif // _WX_BUILD_H_