wxRegion fixes (off by one)

[wxWidgets.git] / setup.h_vms

diff --git a/setup.h_vms b/setup.h_vms
index 78fec5983008d2857a54c9903414eea586f09621..602cd4946dcfcb57fe28cdc0895eae5d6e325939 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -85,6 +85,7 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #define __ALPHA__
+#undef __IA64__
 #undef __OSF__
 #undef __DARWIN__
 #undef __NETBSD__
@@ -111,8 +112,9 @@
 #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 */
@@ -451,7 +453,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