wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index e45a71b0502571204f2cd56cbdb4142809a0afae..4509bab35c638743a2f650f10ff52877b5fe1a58 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -74,6 +74,7 @@
 #undef __SOLARIS__
 #undef __SUNOS__
 #undef __ALPHA__
+#undef __IA64__
 #undef __OSF__
 #undef __BSD__
 #undef __FREEBSD__
@@ -93,14 +94,17 @@
 #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 */
@@ -405,7 +409,6 @@
 /*
  * Use this control
  */
-#define wxUSE_STATUSBAR 0
 #define wxUSE_STATTEXT 0
 /*
  * Use this control
@@ -444,7 +447,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
@@ -486,6 +488,10 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0
 /*
  * Use wxTextFile class
  */
@@ -873,6 +879,9 @@
 /* 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