Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/build.h b/include/wx/build.h
index 5a0fb9d871b52b5f7200f558a98fbd08314ba45e..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,12 +42,6 @@
         __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_UTF8
     #define __WX_BO_UNICODE "UTF-8"
 #elif wxUSE_UNICODE_WCHAR
 #if wxUSE_UNICODE_UTF8
     #define __WX_BO_UNICODE "UTF-8"
 #elif wxUSE_UNICODE_WCHAR


@@ -91,7 +85,7 @@
 #endif
 
 // deriving wxWin containers from STL ones changes them completely:
 #endif
 
 // 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"


@@ -100,7 +94,7 @@
 // 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_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \
      __WX_BO_COMPILER \
      __WX_BO_STL \
      __WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 \


@@ -112,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                                 \
     {                                                                   \