make more readable the checks for incoherent style flags

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 7e67b3a9b206f419bd5070f1e9b466a98a2776ec..8656fa6213bb555ec434a9747316a8703a5a8e51 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -3,7 +3,7 @@
  * Template for the set.h file for VMS                                       *
  * Created from setup.h_in                                                   *
  * Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                            *
- * Date : 10 December 2007                                                   *
+ * Date : 25 November 2008                                                   *
  *                                                                           *
  *****************************************************************************/
 
@@ -210,7 +210,7 @@ typedef pid_t GPid;
 
 #define wxUSE_LOGGUI 1
 
-#define wxUSE_LOG_DIALOG 0
+#define wxUSE_LOG_DIALOG 1
 
 #define wxUSE_CMDLINE_PARSER 1
 
@@ -218,22 +218,24 @@ typedef pid_t GPid;
 
 #define wxUSE_STREAMS       1
 
-#define wxUSE_STD_IOSTREAM  0
-
 #if defined(__DMC__) || defined(__WATCOMC__) \
-     || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_STRING  0
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_DEFAULT  0  
 #else
-    #define wxUSE_STD_STRING  0
+    #define wxUSE_STD_DEFAULT  0
 #endif
 
+#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
+
+#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
+
 #define wxUSE_PRINTF_POS_PARAMS 0
 
 #define wxUSE_LONGLONG      1
 
 #define wxUSE_BASE64        1
 
-#define wxUSE_CONSOLE_EVENTLOOP 0
+#define wxUSE_CONSOLE_EVENTLOOP 1
 
 #define wxUSE_FILE          1
 #define wxUSE_FFILE         1
@@ -249,6 +251,8 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
+#define wxUSE_XLOCALE 1
+
 #define wxUSE_DATETIME      1
 
 #define wxUSE_TIMER         1
@@ -324,6 +328,8 @@ typedef pid_t GPid;
 
 #define wxUSE_AUI       1
 
+#define wxUSE_PROPGRID  1
+
 #ifndef wxUSE_GRAPHICS_CONTEXT
 #define wxUSE_GRAPHICS_CONTEXT 0
 #endif
@@ -439,6 +445,11 @@ typedef pid_t GPid;
 
 #define wxUSE_VALIDATORS 1
 
+#ifdef __WXMSW__
+#define wxUSE_AUTOID_MANAGEMENT 0
+#else
+#define wxUSE_AUTOID_MANAGEMENT 0
+#endif
 
 #define wxUSE_COMMON_DIALOGS 1
 
@@ -625,31 +636,11 @@ typedef pid_t GPid;
 
 /* --- end MSW options --- */
 
-/*
- * Supports bool type
- */
-#define HAVE_BOOL
-
 /*
  * Define if your compiler supports the explicit keyword
  */
 #define HAVE_EXPLICIT 1
 
-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_CONST_CAST 1
-
-/*
- * Define if your compiler supports reinterpret_cast<>()
- */
-#define HAVE_REINTERPRET_CAST 1
-
-/*
- * Define if your compiler supports const_cast<>()
- */
-#define HAVE_STATIC_CAST 1
-
 /*
  * Define if your compiler has C99 va_copy
  */
@@ -702,6 +693,26 @@ typedef pid_t GPid;
  */
 #undef HAVE_GNU_CXX_HASH_MAP
 
+/*
+ * Define if your compiler has std::unordered_map
+ */
+#undef HAVE_STD_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::unordered_set
+ */
+#undef HAVE_STD_UNORDERED_SET
+
+/*
+ * Define if your compiler has std::tr1::unordered_map
+ */
+#undef HAVE_TR1_UNORDERED_MAP
+
+/*
+ * Define if your compiler has std::tr1::unordered_set
+ */
+#undef HAVE_TR1_UNORDERED_SET
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -765,6 +776,11 @@ typedef pid_t GPid;
  */
 #define wxHAVE_PTHREAD_CLEANUP 1
 
+/*
+ * Define if compiler has __thread keyword.
+ */
+#undef HAVE___THREAD_KEYWORD
+
 /* compatibility */
 /*
  * Use OpenGL
@@ -965,6 +981,12 @@ typedef pid_t GPid;
  * with 'char*' for the 3rd parameter instead of 'const char*' */
 #undef HAVE_BROKEN_VSNPRINTF_DECL
 
+/* Define if you have vsscanf() */
+#define HAVE_VSSCANF 1
+
+/* Define if you have vsscanf() declaration in the header */
+#define HAVE_VSSCANF_DECL 1
+
 /* Define if you have usleep() */
 #define HAVE_USLEEP 1
 
@@ -1194,6 +1216,9 @@ typedef pid_t GPid;
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if locale_t is available */
+#undef HAVE_LOCALE_T
+
 /* ---------------------------------------------------------------------
    Win32 adjustments section
    ---------------------------------------------------------------------
@@ -1230,4 +1255,8 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
+#define __VMS_BROKEN_TEMPLATES
+
+#include <stdlib.h>
+
 #endif /* __WX_SETUP_H__ */