assume sizeof(wchar_t) == 2 by default, not 4

[wxWidgets.git] / include / wx / build.h

diff --git a/include/wx/build.h b/include/wx/build.h
index 3e7ea2219ac61b8d578e600e71ce7faa28acfba3..8aeb3f2c15006eedb60ff476e9f74560a768a701 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -50,13 +50,32 @@
 #else
     #define __WX_BO_COMPILER
 #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"
+#else
+    #define __WX_BO_WXWIN_COMPAT_2_2
+#endif
+#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
+
         
 // 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_DEBUG "," __WX_BO_UNICODE \
+     __WX_BO_COMPILER \
+     __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
+     ")"
 
 
+// ----------------------------------------------------------------------------
+// WX_CHECK_BUILD_OPTIONS
+// ----------------------------------------------------------------------------
 
 // 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.
@@ -69,4 +88,29 @@
     };                                                                  \
     static bool gs_buildOptionsCheck = wxCheckBuildOptions();
 
+
+#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_