added wxApp::Yield

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index e45a71b0502571204f2cd56cbdb4142809a0afae..f6e91fec797ca7815abccdd25da4f426c5c0127c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -74,6 +74,7 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__

+#undef __IA64__

 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__


@@ -99,8 +100,9 @@
 #undef WINVER
 
 /* enable native status bar under Win32 */
 #undef WINVER
 
 /* enable native status bar under Win32 */

-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__WXUNIVERSAL__)

 #define wxUSE_NATIVE_STATUSBAR 1
 #define wxUSE_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1

 #endif
 
 /* enable rich edit under Win32 */
 #endif
 
 /* enable rich edit under Win32 */


@@ -444,7 +446,6 @@
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
 #define wxUSE_TOOLBAR_SIMPLE 0
 
 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)

-#define wxUSE_OWNER_DRAWN 1

   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif
   #if wxUSE_TOOLBAR
     #define wxUSE_BUTTONBAR 1
   #endif


@@ -873,6 +874,9 @@
 /* define if you have statfs function */
 #undef HAVE_STATFS
 
 /* define if you have statfs function */
 #undef HAVE_STATFS
 

+/* define if you have statvfs function */
+#undef HAVE_STATVFS
+

 /* Define if you have strptime() */
 #undef HAVE_STRPTIME
 
 /* Define if you have strptime() */
 #undef HAVE_STRPTIME