rename ARRAYSIZE to CELLSARRAYSIZE to avoid conflict with a macro with the same name...

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index da6550b68b391e19303bcde634dce7c871e631e4..d9b15e12aae5703c4c8136681aecb0877705130f 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 : 25 February 2009                                                   *
+ * Date : 27 May 2009                                                        *
  *                                                                           *
  *****************************************************************************/
 
@@ -250,7 +250,11 @@ typedef pid_t GPid;
 #define wxUSE_INTL          1
 #include <locale.h>
 
+#if defined (__WXMOTIF__) || defined( __WXX11__ )
+#define wxUSE_XLOCALE 0
+#else
 #define wxUSE_XLOCALE 1
+#endif
 
 #define wxUSE_DATETIME      1
 
@@ -592,6 +596,16 @@ typedef pid_t GPid;
 #define wxUSE_UNICODE_UTF8 0
 #define wxUSE_UTF8_LOCALE_ONLY 0
 
+/*
+   Use GStreamer for Unix.
+
+   Default is 0 as this requires a lot of dependencies which might not be
+   available.
+
+   Recommended setting: 1 (wxMediaCtrl won't work by default without it)
+ */
+#define wxUSE_GSTREAMER 0
+
 /* --- start MSW options --- */
 
 #ifndef wxUSE_UNICODE_MSLU
@@ -951,12 +965,6 @@ typedef pid_t GPid;
 /* define if you have statvfs function */
 #undef HAVE_STATVFS
 
-/* Define if you have strptime() */
-#define HAVE_STRPTIME 1
-
-/* Define if you have strptime() declaration */
-#define HAVE_STRPTIME_DECL 1
-
 /* Define if you have strtoull() and strtoll() */
 #define HAVE_STRTOULL 1
 
@@ -1267,7 +1275,7 @@ typedef pid_t GPid;
 
 #undef HAVE_SYS_SELECT_H
 
-#ifdef __WXGTK__
+#if defined( __WXGTK__ ) && !defined( VMS_GTK2 )
 #define wxHAS_RAW_BITMAP 1
 #endif