changed the usage of the member vars to be more consistent

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6b58a8117926bafea15f6aa2632de727a41ce4fa..6c22732a6a62326b5661c81e4caf395c47e5b0ad 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -74,29 +74,40 @@
 #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__
+
+/* MS-DOS with DJGPP */
+#undef __DOS__
+
 /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */
 #ifndef __WINDOWS__
 #undef __WINDOWS__
 #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 */
@@ -198,6 +209,11 @@
 */
 #define wxUSE_POPUPWIN 0
 
+/*
+   Use wxTipWindow
+ */
+#define wxUSE_TIPWINDOW 0
+
 /*
  * Use accelerators
  */
@@ -228,6 +244,11 @@
  */
 #define wxUSE_MIMETYPE 0
 
+/*
+ * Use wxSystemOptions
+ */
+#define wxUSE_SYSTEM_OPTIONS 0
+
 /*
  * Use wxMessageDialog (and wxMessageBox)
  */
@@ -401,7 +422,6 @@
 /*
  * Use this control
  */
-#define wxUSE_STATUSBAR 0
 #define wxUSE_STATTEXT 0
 /*
  * Use this control
@@ -440,7 +460,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
@@ -482,6 +501,10 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxTextBuffer class
+ */
+#define wxUSE_TEXTBUFFER 0
 /*
  * Use wxTextFile class
  */
@@ -502,7 +525,7 @@
 /*
  * Use old log dialog instead of new wxLogGui
  */
-#define wxUSE_LOG_DIALOG 1
+#define wxUSE_LOG_DIALOG 0
 /*
  * Use wxStopWatch
  */
@@ -528,13 +551,16 @@
  */
 #define wxUSE_INTL 0
 /*
- * Use streams
+ * Use wxProtocol and related classes
  */
-#define wxUSE_STREAMS 0
+#define wxUSE_PROTOCOL 0
+#define wxUSE_PROTOCOL_FILE 0
+#define wxUSE_PROTOCOL_FTP 0
+#define wxUSE_PROTOCOL_HTTP 0
 /*
- * Use class serialization
+ * Use streams
  */
-#define wxUSE_SERIAL 0
+#define wxUSE_STREAMS 0
 /*
  * Use sockets
  */
@@ -552,6 +578,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0
+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0
 
 /*
  * Use wxTimer
@@ -583,6 +613,16 @@
  */
 #define wxUSE_UNICODE 0
 
+/*
+ * Use MS Layer for Unicode on Win9X (Win32 only)?
+ */
+#define wxUSE_UNICODE_MSLU 0
+
+/*
+ * Use wxURL class
+ */
+#define wxUSE_URL 0
+
 /*
  * Work around a bug in GNU libc 5.x wcstombs() implementation.
  *
@@ -631,10 +671,6 @@
  * Use spline
  */
 #define wxUSE_SPLINES 0
-/*
- * Use wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0
 
 /*
  * Use the mdi architecture
@@ -762,6 +798,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * wxPalette class
+ */
+#define wxUSE_PALETTE 0
+
 /*
  * wxImage support
  */
@@ -777,6 +818,11 @@
  */
 #define wxUSE_PCX 0
 
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+
 /*
  * PNM image format support
  */
@@ -787,6 +833,11 @@
  */
 #define wxUSE_XPM 0
 
+/*
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
+ */
+#define wxUSE_ICO_CUR 0
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -864,6 +915,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
 
@@ -936,6 +990,12 @@
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
+/* Define if you have the mktemp function.  */
+#undef HAVE_MKTEMP
+
+/* Define if you have the mkstemp function.  */
+#undef HAVE_MKSTEMP
+
 /* Define if you have the nanosleep function.  */
 #undef HAVE_NANOSLEEP
 
@@ -993,6 +1053,9 @@
 /* Define if you have the <wcstr.h> header file.  */
 #undef HAVE_WCSTR_H
 
+/* Define if you have the <wctype.h> header file.  */
+#undef HAVE_WCTYPE_H
+
 /* Define if you have the <iconv.h> header file.  */
 #undef HAVE_ICONV_H
 
@@ -1005,6 +1068,9 @@
 /* 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