oops, compilation fix after applying the patch

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 30a3a4261d870f8976ddfecdd2da39441d2d26c5..57b110ba55d5e5c96a4b2de3f35dd225c3f05575 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -61,38 +61,45 @@
 /* Define this if your version of GTK+ is greater than 1.3 */
 #undef __WXGTK20__
 
+/* Define this if your version of Motif is greater than 2.0 */
+#undef __WXMOTIF20__
+
 /*
  * Define to 1 for Unix[-like] system
  */
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+
 #undef __AIX__
-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __IA64__
-#undef __OSF__
 #undef __BSD__
-#undef __FREEBSD__
 #undef __DARWIN__
+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__
 #undef __NETBSD__
-#undef __VMS__
+#undef __OPENBSD__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__
 #undef __ULTRIX__
-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#undef __VMS__
+
+#undef __IA64__
+#undef __ALPHA__
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
 
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
@@ -102,13 +109,21 @@
 #undef __WINDOWS__
 #endif
 
+#ifndef __WIN95__
 #undef __WIN95__
+#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
+#ifndef __GNUWIN32__
 #undef __GNUWIN32__
+#endif
+#ifndef STRICT
 #undef STRICT
+#endif
+#ifndef WINVER
 #undef WINVER
+#endif
 
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
@@ -121,7 +136,7 @@
 #endif
 
 /* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
@@ -137,6 +152,15 @@
  */
 #undef HAVE_EXPLICIT
 
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+
+/*
+ * use STL for containers and wxString
+ */
+#define wxUSE_STL 0
 /*
  * Use regex support
  */
@@ -188,7 +212,9 @@
 /*
  * Use GUI
  */
+#ifndef wxUSE_GUI
 #define wxUSE_GUI 0
+#endif
 /*
  * Don't use GUI (defined to 1 when compiling/using base only)
  */
@@ -309,6 +335,11 @@
  */
 #define wxUSE_DRAGIMAGE 0
 
+/*
+ * Enable accessibility support
+ */
+#define wxUSE_ACCESSIBILITY 0
+
 /*
  * Use property sheet classes
  */
@@ -357,6 +388,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0
 /*
  * Use this control
  */
@@ -366,12 +401,12 @@
  */
 #define wxUSE_GRID 0
 /*
- * Use this control
+ * Use the new prototype wxGrid classes
+ * (wxUSE_GRID must also be defined)
  */
 #define wxUSE_NEW_GRID 0
 /*
- * Use the new prototype wxGrid classes
- * (wxUSE_GRID must also be defined)
+ * Use wxImageList class
  */
 #define wxUSE_IMAGLIST 0
 /*
@@ -746,6 +781,10 @@
  * Compatibility with 2.2 API
  */
 #define WXWIN_COMPATIBILITY_2_2 0
+/*
+ * Compatibility with 2.4 API
+ */
+#define WXWIN_COMPATIBILITY_2_4 0
 /*
  * Enables debugging: memory tracing, assert, etc., contains debug level
  */
@@ -880,6 +919,9 @@
 /* The type of 3rd argument to getsockname() - usually size_t or int */
 #undef SOCKLEN_T
 
+/* The type of statvfs(2) argument */
+#undef WX_STATFS_T
+
 /* The signal handler prototype */
 #undef wxTYPE_SA_HANDLER
 
@@ -890,6 +932,9 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
+/* Define if you have poll(2) function */
+#undef HAVE_POLL
+
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
@@ -905,12 +950,6 @@
 /* Define if you have support for large (64 bit size) files */
 #undef HAVE_LARGEFILE_SUPPORT
 
-/* Required by HAVE_LARGEFILE_SUPPORT on some systems */
-#undef _FILE_OFFSET_BITS
-
-/* Ditto */
-#undef _LARGE_FILES
-
 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 
@@ -959,6 +998,9 @@
 /* Define if you have vsnprintf() */
 #undef HAVE_VSNPRINTF
 
+/* Define if you have vsnprintf() declaration in the header */
+#undef HAVE_VSNPRINTF_DECL
+
 /* Define if you have usleep() */
 #undef HAVE_USLEEP
 
@@ -1046,9 +1088,6 @@
 /* Define if you have the usleep function.  */
 #undef HAVE_USLEEP
 
-/* Define if you have the vfork function.  */
-#undef HAVE_VFORK
-
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
@@ -1109,9 +1148,14 @@
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_VSWPRINTF
 
+/* Define this if you have _vsnwprintf */
+#undef HAVE__VSNWPRINTF
+
 /* Define this if you are using gtk and gdk contains support for X11R6 XIM */
 #undef HAVE_XIM
 
+/* Define this is you have X11/extensions/shape.h */
+#undef HAVE_XSHAPE
 
 /* -------------------------------------------------------------------------
    Win32 adjustments section