Fixed typo in my last commit (it did break socket detection code :-( ).

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index ee62da1df4743604a65ebac0ee19f77469c6b48a..5ef08f67418b3eb7f44e6a150633ab00afc2a57c 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -122,6 +122,10 @@
 #define wxUSE_OWNER_DRAWN 1
 #endif
 
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
+#endif
+
 /* enable rich edit under Win32 */
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
@@ -213,7 +217,11 @@
 /*
  * Use wxPopupWindow (useful in wxUniv only for now)
  */
+#ifdef __WXMOTIF__
+#define wxUSE_POPUPWIN 0
+#else
 #define wxUSE_POPUPWIN 1
+#endif
 
 /*
    Use wxTipWindow
@@ -559,13 +567,16 @@
  */
 #define wxUSE_INTL 1
 /*
- * Use streams
+ * Use wxProtocol and related classes
  */
-#define wxUSE_STREAMS 1
+#define wxUSE_PROTOCOL 1
+#define wxUSE_PROTOCOL_FILE 1
+#define wxUSE_PROTOCOL_FTP 1
+#define wxUSE_PROTOCOL_HTTP 1
 /*
- * Use class serialization
+ * Use streams
  */
-#define wxUSE_SERIAL 1
+#define wxUSE_STREAMS 1
 /*
  * Use sockets
  */
@@ -583,6 +594,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 1
+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0
 
 /*
  * Use wxTimer
@@ -619,6 +634,11 @@
  */
 #define wxUSE_UNICODE_MSLU 0
 
+/*
+ * Use wxURL class
+ */
+#define wxUSE_URL 1
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -654,7 +674,11 @@
 /*
  * Use tooltips
  */
+#ifdef __WXMOTIF__
+#define wxUSE_TOOLTIPS 0
+#else
 #define wxUSE_TOOLTIPS 1
+#endif
 /*
  * Use dnd
  */
@@ -818,6 +842,11 @@
  */
 #define wxUSE_PCX 1
 
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 1
+
 /*
  * PNM image format support
  */
@@ -828,6 +857,11 @@
  */
 #define wxUSE_XPM 1
 
+/*
+ * MS Icons and Cursors format support
+ */
+#define wxUSE_ICO_CUR 1
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -858,9 +892,6 @@
  * present */
 #define WX_GMTOFF_IN_TM
 
-/* iconv()'s 2nd argument is char ** and not const char ** */
-#define WX_ICONV_TAKES_CHAR 1
-
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
@@ -1023,9 +1054,12 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
-/* Define if you have the <iconv.h> header file.  */
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #define HAVE_ICONV_H 1
 
+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST
+
 /* Define if you have the <langinfo.h> header file.  */
 #define HAVE_LANGINFO_H 1