Demo cleanup

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 925b4c5c20e2e1eaa8c829ce5d29016e8708ea9b..4509bab35c638743a2f650f10ff52877b5fe1a58 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -74,29 +74,37 @@
 #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__

+#undef __DARWIN__

 #undef __NETBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
 
 #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__
 #endif
 
 #undef __WIN95__
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #endif
 
 #undef __WIN95__

+#ifndef __WIN32__

 #undef __WIN32__
 #undef __WIN32__

+#endif

 #undef __GNUWIN32__
 #undef STRICT
 #undef WINVER
 
 /* enable native status bar under Win32 */
 #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_NATIVE_STATUSBAR 1

+#define wxUSE_OWNER_DRAWN 1

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


@@ -401,7 +409,6 @@
 /*
  * Use this control
  */
 /*
  * Use this control
  */

-#define wxUSE_STATUSBAR 0

 #define wxUSE_STATTEXT 0
 /*
  * Use this control
 #define wxUSE_STATTEXT 0
 /*
  * Use this control


@@ -440,7 +447,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


@@ -482,6 +488,10 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0

+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0

 /*
  * Use wxTextFile class
  */
 /*
  * Use wxTextFile class
  */


@@ -762,6 +772,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
  */
 #define wxUSE_ZIPSTREAM 0
 

+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+

 /*
  * wxImage support
  */
 /*
  * wxImage support
  */


@@ -864,6 +879,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