fixed recent modeless dialog breakage caused by removing wxDIALOG_MODAL (wxModelessWi...

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

diff --git a/include/wx/build.h b/include/wx/build.h
index a9bf3923ab8f70d6b6f428d453dbb077fc23fa26..833807da0cf5942cbed445585fdb4b8846f6fb5a 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -18,7 +18,8 @@
 // WX_BUILD_OPTIONS_SIGNATURE
 // ----------------------------------------------------------------------------
 
 // WX_BUILD_OPTIONS_SIGNATURE
 // ----------------------------------------------------------------------------
 

-#define __WX_BO_STRINGIZE(x)  #x
+#define __WX_BO_STRINGIZE(x)   __WX_BO_STRINGIZE0(x)
+#define __WX_BO_STRINGIZE0(x)  #x

 
 #if (wxMINOR_VERSION % 2) == 0
     #define __WX_BO_VERSION(x,y,z) \
 
 #if (wxMINOR_VERSION % 2) == 0
     #define __WX_BO_VERSION(x,y,z) \


@@ -39,13 +40,49 @@
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif

-    
+
+// GCC and Intel C++ share same C++ ABI, check if compiler versions are
+// compatible:
+#if (defined(__GNUG__) || defined(__INTEL_COMPILER) && \
+     defined(__GXX_ABI_VERSION))
+    #define __WX_BO_COMPILER \
+            ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
+#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
+
+// 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) \
 // 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_DEBUG "," __WX_BO_UNICODE \
+     __WX_BO_COMPILER \
+     __WX_BO_STL \
+     __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.
 
 // 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.


@@ -58,4 +95,29 @@
     };                                                                  \
     static bool gs_buildOptionsCheck = wxCheckBuildOptions();
 
     };                                                                  \
     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_
 #endif // _WX_BUILD_H_