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 fe2d8cff64316cb0a00ed33fa4ffe7b0f8e2ca6f..5ef08f67418b3eb7f44e6a150633ab00afc2a57c 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -85,7 +85,10 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__
+#undef __IA64__
 #undef __OSF__
+#undef __DARWIN__
+#undef __NETBSD__
 #undef __BSD__
 #undef __FREEBSD__
 #define __VMS__
@@ -94,20 +97,33 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+
+/* MS-DOS with DJGPP */
+#undef __DOS__
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 #undef __WIN95__
+#ifndef __WIN32__
 #undef __WIN32__
+#endif
 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */
-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
+#define wxUSE_OWNER_DRAWN 1
+#endif
+
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
 #endif
 
 /* enable rich edit under Win32 */
@@ -145,13 +161,13 @@
 /*
  * Use iODBC
  */
-#define wxUSE_ODBC 0
+#define wxUSE_ODBC 1
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
  * Use freetype
  */
-#define wxUSE_FREETYPE 0
+#define wxUSE_FREETYPE 1
 /*
  * Use Threads
  */
@@ -201,7 +217,16 @@
 /*
  * Use wxPopupWindow (useful in wxUniv only for now)
  */
+#ifdef __WXMOTIF__
+#define wxUSE_POPUPWIN 0
+#else
 #define wxUSE_POPUPWIN 1
+#endif
+
+/*
+   Use wxTipWindow
+*/
+#define wxUSE_TIPWINDOW 1
 
 /*
  * Use accelerators
@@ -233,6 +258,11 @@
  */
 #define wxUSE_MIMETYPE 1
 
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 1
+
 /*
  * Use wxMessageDialog (and wxMessageBox)
  */
@@ -446,7 +476,6 @@
 #define wxUSE_TOOLBAR_SIMPLE 1
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-#define wxUSE_OWNER_DRAWN 1 
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
@@ -489,6 +518,10 @@
  * Use wxFile class
  */
 #define wxUSE_FILE 1
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 1
 /*
  * Use wxTextFile class
  */
@@ -508,7 +541,7 @@
 /*
  * Use old log dialog instead of new wxLogGui
  */
-#define wxUSE_LOG_DIALOG 1
+#define wxUSE_LOG_DIALOG 0
 /*
  * Use wxStopWatch
  */
@@ -534,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
  */
@@ -558,6 +594,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 1
+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0
 
 /*
  * Use wxTimer
@@ -589,6 +629,16 @@
  */
 #define wxUSE_UNICODE 0
 
+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#define wxUSE_UNICODE_MSLU 0
+
+/*
+ * Use wxURL class
+ */
+#define wxUSE_URL 1
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -624,7 +674,11 @@
 /*
  * Use tooltips
  */
+#ifdef __WXMOTIF__
+#define wxUSE_TOOLTIPS 0
+#else
 #define wxUSE_TOOLTIPS 1
+#endif
 /*
  * Use dnd
  */
@@ -788,6 +842,11 @@
  */
 #define wxUSE_PCX 1
 
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 1
+
 /*
  * PNM image format support
  */
@@ -798,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.
@@ -828,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
 
@@ -846,6 +907,12 @@
 /* Define if you have localtime() */
 #define HAVE_LOCALTIME
 
+/* Define if you have the mktemp function.  */
+#define HAVE_MKTEMP 1
+
+/* Define if you have the mkstemp function.  */
+#define HAVE_MKSTEMP 1
+
 /* Define if you have nanosleep() */
 #undef HAVE_NANOSLEEP
 
@@ -889,10 +956,10 @@
 #undef HAVE_VSNPRINTF
 
 /* Define if you have usleep() */
-#define HAVE_USLEEP
+#define HAVE_USLEEP 1
 
 /* Define if you have wcslen function  */
-#define HAVE_WCSLEN
+#define HAVE_WCSLEN 1
 
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
@@ -931,10 +998,10 @@
 #define HAVE_DLERROR 1
 
 /* Define if you have the gethostname function.  */
-#define HAVE_GETHOSTNAME
+#define HAVE_GETHOSTNAME 1
 
 /* Define if you have the inet_addr function.  */
-#define HAVE_INET_ADDR
+#define HAVE_INET_ADDR 1
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
@@ -952,13 +1019,13 @@
 #undef HAVE_THR_SETCONCURRENCY
 
 /* Define if you have the uname function.  */
-#define HAVE_UNAME
+#define HAVE_UNAME 1
 
 /* Define if you have the usleep function.  */
-#define HAVE_USLEEP
+#define HAVE_USLEEP 1
 
 /* Define if you have the vfork function.  */
-#define HAVE_VFORK
+#define HAVE_VFORK 1
 
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
@@ -976,20 +1043,23 @@
 #undef HAVE_SCHED_H
 
 /* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H
+#define HAVE_STRINGS_H 1
 
 /* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
 
 /* Define if you have the <wchar.h> header file.  */
-#define HAVE_WCHAR_H
+#define HAVE_WCHAR_H 1
 
 /* 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