Wrappers for *ToText

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

diff --git a/include/wx/build.h b/include/wx/build.h
index 3c926f3c1873899f558caebd70e29ef7621357af..9b0413b91c86c4273bf6a212ac54ada576d5a5a1 100644 (file)
--- a/include/wx/build.h
+++ b/include/wx/build.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     07.05.02
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     07.05.02
 // RCS-ID:      $Id$

-// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2002 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -41,27 +41,29 @@
     #define __WX_BO_UNICODE "ANSI"
 #endif
 
     #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))
+// GCC and Intel C++ share same C++ ABI (and possibly others in the future),
+// check if compiler versions are compatible:
+#if defined(__GXX_ABI_VERSION)

     #define __WX_BO_COMPILER \
             ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)
     #define __WX_BO_COMPILER \
             ",compiler with C++ ABI " __WX_BO_STRINGIZE(__GXX_ABI_VERSION)

+#elif defined(__INTEL_COMPILER)
+    #define __WX_BO_COMPILER ",Intel C++"
+#elif defined(__GNUG__)
+    #define __WX_BO_COMPILER ",GCC " \
+            __WX_BO_STRINGIZE(__GNUC__) "." __WX_BO_STRINGIZE(__GNUC_MINOR__)
+#elif defined(__VISUALC__)
+    #define __WX_BO_COMPILER ",Visual C++"
+#elif defined(__BORLANDC__)
+    #define __WX_BO_COMPILER ",Borland C++"
+#elif defined(__DIGITALMARS__)
+    #define __WX_BO_COMPILER ",DigitalMars"
+#elif defined(__WATCOMC__)
+    #define __WX_BO_COMPILER ",Watcom C++"

 #else
     #define __WX_BO_COMPILER
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions
 #else
     #define __WX_BO_COMPILER
 #endif
 
 // WXWIN_COMPATIBILITY macros affect presence of virtual functions

-#if WXWIN_COMPATIBILITY
-    #define __WX_BO_WXWIN_COMPAT_1_68 ",compatible with 1.68"
-#else
-    #define __WX_BO_WXWIN_COMPAT_1_68
-#endif
-#if WXWIN_COMPATIBILITY_2
-    #define __WX_BO_WXWIN_COMPAT_2_0 ",compatible with 2.0"
-#else
-    #define __WX_BO_WXWIN_COMPAT_2_0
-#endif

 #if WXWIN_COMPATIBILITY_2_2
     #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
 #else
 #if WXWIN_COMPATIBILITY_2_2
     #define __WX_BO_WXWIN_COMPAT_2_2 ",compatible with 2.2"
 #else


@@ -73,13 +75,19 @@
     #define __WX_BO_WXWIN_COMPAT_2_4
 #endif
 
     #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) \
     " (" __WX_BO_DEBUG "," __WX_BO_UNICODE \
      __WX_BO_COMPILER \
 // 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_WXWIN_COMPAT_1_68 __WX_BO_WXWIN_COMPAT_2_0 \
+     __WX_BO_STL \

      __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
      ")"
 
      __WX_BO_WXWIN_COMPAT_2_2 __WX_BO_WXWIN_COMPAT_2_4 \
      ")"