X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9d59ee7e0cbe4acae6153adafb5ddce9a4e65dd..d8a7829312e4fa8e67950f68eafa5d507b4e9826:/include/wx/build.h diff --git a/include/wx/build.h b/include/wx/build.h index 4cc0dca46d..5a0fb9d871 100644 --- a/include/wx/build.h +++ b/include/wx/build.h @@ -48,8 +48,10 @@ #define __WX_BO_DEBUG "no debug" #endif -#if wxUSE_UNICODE - #define __WX_BO_UNICODE "Unicode" +#if wxUSE_UNICODE_UTF8 + #define __WX_BO_UNICODE "UTF-8" +#elif wxUSE_UNICODE_WCHAR + #define __WX_BO_UNICODE "wchar_t" #else #define __WX_BO_UNICODE "ANSI" #endif @@ -65,7 +67,7 @@ #define __WX_BO_COMPILER ",GCC " \ __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__) #elif defined(__VISUALC__) - #define __WX_BO_COMPILER ",Visual C++" + #define __WX_BO_COMPILER ",Visual C++ " __WX_BO_STRINGIZE(_MSC_VER) #elif defined(__BORLANDC__) #define __WX_BO_COMPILER ",Borland C++" #elif defined(__DIGITALMARS__) @@ -77,15 +79,15 @@ #endif // WXWIN_COMPATIBILITY macros affect presence of virtual functions -#if WXWIN_COMPATIBILITY_2_2 - #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2" +#if WXWIN_COMPATIBILITY_2_6 + #define __WX_BO_WXWIN_COMPAT_2_6 ",compatible with 2.6" #else - #define __WX_BO_WXWIN_COMPAT_2_2 + #define __WX_BO_WXWIN_COMPAT_2_6 #endif -#if WXWIN_COMPATIBILITY_2_4 - #define __WX_BO_WXWIN_COMPAT_2_4 ",compatible with 2.4" +#if WXWIN_COMPATIBILITY_2_8 + #define __WX_BO_WXWIN_COMPAT_2_8 ",compatible with 2.8" #else - #define __WX_BO_WXWIN_COMPAT_2_4 + #define __WX_BO_WXWIN_COMPAT_2_8 #endif // deriving wxWin containers from STL ones changes them completely: @@ -101,7 +103,7 @@ " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \ __WX_BO_COMPILER \ __WX_BO_STL \ - __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \ + __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \ ")" @@ -112,37 +114,14 @@ // Use this macro to check build options. Adding it to a file in DLL will // ensure that the DLL checks build options in same way IMPLEMENT_APP() does. #define WX_CHECK_BUILD_OPTIONS(libName) \ - static bool wxCheckBuildOptions() \ + static struct wxBuildOptionsChecker \ { \ - wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \ - libName); \ - return true; \ - }; \ - static bool gs_buildOptionsCheck = wxCheckBuildOptions(); + wxBuildOptionsChecker() \ + { \ + wxAppConsole::CheckBuildOptions(WX_BUILD_OPTIONS_SIGNATURE, \ + libName); \ + } \ + } 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_