Better fix

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 22b2469aafddbb70a492f8c80c92eebb52cd2f0e..4f17f1ff4a0ed1f2cbe38f2e02d3355ff8ad110d 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -68,14 +68,14 @@
     using OS X libraries like Carbon or CoreServices.
 
  */
     using OS X libraries like Carbon or CoreServices.
 
  */

-#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#if defined(__WXMAC_OSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE)) || defined(__WXASPEN__)

 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>
 #   define __WXOSX__
 #endif
 
 #ifdef __WXOSX__
 #    ifdef __WXMAC_XCODE__
 #        include <unistd.h>

-#        include "wx/mac/carbon/config_xcode.h"
+#        include "wx/mac/config_xcode.h"

 #    endif
 #endif
 /*
 #    endif
 #endif
 /*


@@ -275,15 +275,18 @@
 #endif
 
 
 #endif
 
 

-/* test for old versions of Borland C, normally need at least 5.82, Turbo explorer, 
-   available for free at http://www.turboexplorer.com/downloads 
+/*
+   test for old versions of Borland C, normally need at least 5.82, Turbo
+   explorer, available for free at http://www.turboexplorer.com/downloads 

 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
 */
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)

-#error "This version of wxWidgets requires a newer version of Borland - we recommend 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."

 #endif /* __BORLANDC__ */
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
 #endif /* __BORLANDC__ */
 
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)

-#error "This version of wxWidgets has problems with Borland 5.6; we recommend getting Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#   ifndef _USE_OLD_RW_STL
+#       error "wxWidgets is incompatible with default Borland C++ 5.6 STL library, please add -D_USE_OLD_RW_STL to your bcc32.cfg to use RogueWave STL implementation."
+#   endif

 #endif /* __BORLANDC__ */
 
 
 #endif /* __BORLANDC__ */
 
 


@@ -464,6 +467,27 @@
      */
 #    if defined(_MSC_VER) && !defined(__MWERKS__)
 #        define __VISUALC__ _MSC_VER
      */
 #    if defined(_MSC_VER) && !defined(__MWERKS__)
 #        define __VISUALC__ _MSC_VER

+
+    /*
+       define special symbols for different VC version instead of writing tests
+       for magic numbers such as 1200, 1300 &c repeatedly
+     */
+#   if __VISUALC__ < 1100
+#       error "This Visual C++ version is too old and not supported any longer."
+#   elif __VISUALC__ < 1200
+#       define __VISUALC5__
+#   elif __VISUALC__ < 1300
+#       define __VISUALC6__
+#   elif __VISUALC__ < 1400
+#       define __VISUALC7__
+#   elif __VISUALC__ < 1500
+#       define __VISUALC8__
+#   elif __VISUALC__ < 1600
+#       define __VISUALC9__
+#   else
+#       pragma message("Please update this code for the next VC++ version")
+#   endif
+

 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #    elif defined(__WATCOMC__)
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #    elif defined(__WATCOMC__)


@@ -538,6 +562,17 @@
 #define wxNEEDS_CHARPP
 #endif
 
 #define wxNEEDS_CHARPP
 #endif
 

+/*
+   This macro can be used to test the Visual C++ version.
+*/
+#ifndef __VISUALC__
+#   define wxVISUALC_VERSION(major) 0
+#   define wxCHECK_VISUALC_VERSION(major) 0
+#else
+#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
+#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
+#endif
+

 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min


@@ -640,6 +675,15 @@
 # define wxVMS_USE_STD
 #endif
 
 # define wxVMS_USE_STD
 #endif
 

+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif
+#endif
+

 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.