Fix for decoding of utf-16 surrogates. Also remove #include that's not needed

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index aba06441bff19c08db45ecb0b5e39a4200a223a8..9bd4be7c8fb7270fa23d4e239eaf50a2f0808162 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.stm.tudelft.nl)                             *
- * Date : 9 November 1999                                                    *
+ * Date : 15 March 2005                                                      *
  *                                                                           *
  *****************************************************************************/
 
@@ -122,6 +122,9 @@
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
+/* Hack to make IOGraphicsTypes.h not define Point conflicting with MacTypes */
+#undef __Point__
+
 /* MS-DOS with DJGPP */
 #undef __DOS__
 
@@ -164,18 +167,15 @@
 
 #define wxUSE_DEBUG_CONTEXT 0
 
+#define wxUSE_DEBUGREPORT 0
+
 #define wxUSE_MEMORY_TRACING 0
 
 #define wxUSE_GLOBAL_MEMORY_OPERATORS 0
 
 #define wxUSE_DEBUG_NEW_ALWAYS 0
 
-#if defined(_MSC_VER) || \
-    (defined(__BORLANDC__) && __BORLANDC__ >= 0x0550)
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#else
-    #define wxUSE_ON_FATAL_EXCEPTION 0
-#endif
+#define wxUSE_ON_FATAL_EXCEPTION 0
 
 #define wxUSE_STACKWALKER 0
 
@@ -219,6 +219,8 @@
 
 #define wxUSE_FSVOLUME      1
 
+#define wxUSE_STDPATHS      1
+
 #define wxUSE_TEXTBUFFER    1
 
 #define wxUSE_TEXTFILE      1
@@ -249,7 +251,7 @@
 
 #define wxUSE_FS_INET       1
 
-#define wxUSE_ARCSTREAM     1
+#define wxUSE_ARCHIVE_STREAMS     1
 
 #define wxUSE_ZIPSTREAM     1
 
@@ -285,6 +287,8 @@
 
 #define wxUSE_DIRECTSHOW    1
 
+#define wxUSE_GSTREAMER     0
+
 #define wxUSE_XRC       1
 
 #if wxUSE_XRC
@@ -335,11 +339,7 @@
 
 #define wxUSE_STATUSBAR    1
 
-#if defined(__WXMSW__) || defined(__WXMAC__)
-#define wxUSE_NATIVE_STATUSBAR        0
-#else
 #define wxUSE_NATIVE_STATUSBAR        0
-#endif
 
 #define wxUSE_TOOLBAR 1
 #define wxUSE_TOOLBAR_NATIVE 1
@@ -481,9 +481,6 @@
 
 #define wxUSE_AFM_FOR_POSTSCRIPT 1
 
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-
 #define wxUSE_ODBC          1
 
 #define wxODBC_FWD_ONLY_CURSORS         1
@@ -1018,6 +1015,8 @@
       with wx/msw/setup.h */
 #define wxUSE_XPM_IN_MSW wxUSE_XPM
 
+#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
+
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*