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

diff --git a/setup.h_vms b/setup.h_vms
index fe2d8cff64..bc981e106d 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,26 @@
 #undef __EMX__
 #undef _GNU_SOURCE
 
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+
 /* 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 +154,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
  */
@@ -446,7 +455,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