added wxApp::Yield

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 7cc5cb38a91c2f9187535b4f9b6baeaf64935aef..f6e91fec797ca7815abccdd25da4f426c5c0127c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -74,15 +74,20 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__
+#undef __IA64__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
+#undef __DARWIN__
 #undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
 
+/* PowerPC Darwin & Mac OS X */
+#undef __POWERPC__
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
@@ -95,8 +100,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 */
@@ -440,7 +446,6 @@
 #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
@@ -762,6 +767,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+
 /*
  * wxImage support
  */
@@ -861,6 +871,12 @@
 /* Define if you have shl_load() */
 #undef HAVE_SHL_LOAD
 
+/* 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
 
@@ -1002,7 +1018,31 @@
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
+/* Define if you have wcsrtombs() function */
+#undef HAVE_WCSRTOMBS
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
+
+/* --------------------------------------------------------*
+ *  This stuff is static, it doesn't get modified directly
+ *  by configure.
+*/
+
+#include "wx/chkconf.h"
+
+/*
+   define some constants identifying wxWindows version in more details than
+   just the version number
+ */
+
+/* wxLogChain class available */
+#define wxHAS_LOG_CHAIN
+
+/* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
+#undef wxHAS_WORKING_GTK_DC_BLIT
+
+
 #endif /* __WX_SETUP_H__ */
+