X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9e4e191af3d350f0438bdc14fedfce219143a3a5..8916d00747c8e7b704ad549afcd8d0f88b6d861e:/setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index fe2d8cff64..ee62da1df4 100644
--- 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,29 @@
 #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
 
 /* enable rich edit under Win32 */
@@ -145,13 +157,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
  */
@@ -203,6 +215,11 @@
  */
 #define wxUSE_POPUPWIN 1
 
+/*
+   Use wxTipWindow
+*/
+#define wxUSE_TIPWINDOW 1
+
 /*
  * Use accelerators
  */
@@ -233,6 +250,11 @@
  */
 #define wxUSE_MIMETYPE 1
 
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 1
+
 /*
  * Use wxMessageDialog (and wxMessageBox)
  */
@@ -446,7 +468,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 +510,10 @@
  * Use wxFile class
  */
 #define wxUSE_FILE 1
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 1
 /*
  * Use wxTextFile class
  */
@@ -508,7 +533,7 @@
 /*
  * Use old log dialog instead of new wxLogGui
  */
-#define wxUSE_LOG_DIALOG 1
+#define wxUSE_LOG_DIALOG 0
 /*
  * Use wxStopWatch
  */
@@ -589,6 +614,11 @@
  */
 #define wxUSE_UNICODE 0
 
+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#define wxUSE_UNICODE_MSLU 0
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -846,6 +876,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 +925,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 +967,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 +988,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,13 +1012,13 @@
 #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