Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/build.h b/include/wx/build.h
index f0cebe20875bc28de16077e96c2acf3b25e5f406..722f0dd031c8e52390eb16bace839102480671f9 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -15,7 +15,7 @@
 #include "wx/version.h"
 
 // NB: This file contains macros for checking binary compatibility of libraries
 #include "wx/version.h"
 
 // NB: This file contains macros for checking binary compatibility of libraries

-//     in multilib buildm, plugins and user components.
+//     in multilib builds, plugins and user components.

 //     The WX_BUILD_OPTIONS_SIGNATURE macro expands into string that should
 //     uniquely identify binary compatible builds: i.e. if two builds of the
 //     library are binary compatible, their signature string should be the
 //     The WX_BUILD_OPTIONS_SIGNATURE macro expands into string that should
 //     uniquely identify binary compatible builds: i.e. if two builds of the
 //     library are binary compatible, their signature string should be the


@@ -42,14 +42,10 @@
         __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) "." __WX_BO_STRINGIZE(z)
 #endif
 
         __WX_BO_STRINGIZE(x) "." __WX_BO_STRINGIZE(y) "." __WX_BO_STRINGIZE(z)
 #endif
 

-#ifdef __WXDEBUG__
-    #define __WX_BO_DEBUG "debug"
-#else
-    #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
 #else
     #define __WX_BO_UNICODE "ANSI"
 #endif


@@ -65,7 +61,7 @@
     #define __WX_BO_COMPILER ",GCC " \
             __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
 #elif defined(__VISUALC__)
     #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__)
 #elif defined(__BORLANDC__)
     #define __WX_BO_COMPILER ",Borland C++"
 #elif defined(__DIGITALMARS__)


@@ -77,19 +73,19 @@
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
 #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_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:
 
 // deriving wxWin containers from STL ones changes them completely:

-#if wxUSE_STL
+#if wxUSE_STD_CONTAINERS

     #define __WX_BO_STL ",STL containers"
 #else
     #define __WX_BO_STL ",wx containers"
     #define __WX_BO_STL ",STL containers"
 #else
     #define __WX_BO_STL ",wx containers"


@@ -98,10 +94,10 @@
 // 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_UNICODE \

      __WX_BO_COMPILER \
      __WX_BO_STL \
      __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 \

      ")"
 
 
      ")"
 
 


@@ -110,7 +106,7 @@
 // ----------------------------------------------------------------------------
 
 // Use this macro to check build options. Adding it to a file in DLL will
 // ----------------------------------------------------------------------------
 
 // 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.
+// ensure that the DLL checks build options in same way wxIMPLEMENT_APP() does.

 #define WX_CHECK_BUILD_OPTIONS(libName)                                 \
     static struct wxBuildOptionsChecker                                 \
     {                                                                   \
 #define WX_CHECK_BUILD_OPTIONS(libName)                                 \
     static struct wxBuildOptionsChecker                                 \
     {                                                                   \


@@ -122,28 +118,4 @@
     } gs_buildOptionsCheck;
 
 
     } 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_
 #endif // _WX_BUILD_H_