wxVariantData no longer inherits from wxObject

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 8bdae42935c3d76b9fb9602138435bee6a988f32..bbb005406b914964d4ce5649c4a74897a972b79f 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -23,14 +23,6 @@
 #   include <stddef.h>
 #endif
 
-/*
-    This header must be included before anything else under VMS
- */
-#ifdef __VMS
-#   include <vms_jackets.h>
-#   undef ConnectionNumber
-#endif
-
 /*
     WXMAC variants
     __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
@@ -265,6 +257,14 @@
 #endif
 
 
+/* test for old versions of Borland C, need at least 5.82, Turbo explorer, 
+   available for free at http://www.turboexplorer.com/downloads 
+*/
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582)
+#error "This version of wxWidgets requires at least Borland 5.82 (Turbo Explorer); You may at your own risk remove this line and try your system"
+#endif //__BORLANDC__
+
+
 /*
    This macro can be used to test the Open Watcom version.
 */
@@ -591,6 +591,15 @@
 #    define wxSTD
 #endif
 
+/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
+ * are only available in the std-namespace. (BUG???)
+ */
+#if defined(  __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
+# define wxVMS_USE_STD std::
+#else
+# define wxVMS_USE_STD
+#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.