X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b6b4dfcf48af89d910df5a21786fbcd02db8c97..4df410bf5ca57a0775b885119023baa88ee48b88:/setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 1a15cfcc25..94fa9896b9 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -1,4 +1,4 @@
-/* This define (__WX_SETUP_H__) is used both to insure setup.h is included
+/* This define (__WX_SETUP_H__) is used both to ensure setup.h is included
  * only once and to indicate that we are building using configure. */
 #ifndef __WX_SETUP_H__
 #define __WX_SETUP_H__
@@ -42,6 +42,9 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
+/* Define this to get extra features from GNU libc. */
+#undef _GNU_SOURCE
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
@@ -80,13 +83,18 @@
 #undef __FREEBSD__
 #undef __DARWIN__
 #undef __NETBSD__
+#undef __OPENBSD__
 #undef __VMS__
 #undef __ULTRIX__
 #undef __DATA_GENERAL__
 #undef __EMX__
 
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0
+
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
+#undef TARGET_CARBON
 
 /* MS-DOS with DJGPP */
 #undef __DOS__
@@ -96,13 +104,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__)
@@ -110,6 +126,10 @@
 #define wxUSE_OWNER_DRAWN 1
 #endif
 
+#if defined(__WXPM__)
+#define wxUSE_OWNER_DRAWN 1
+#endif
+
 /* enable rich edit under Win32 */
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
@@ -122,6 +142,11 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Define if your compiler supports the explicit keyword
+ */
+#undef HAVE_EXPLICIT
+
 /*
  * Use regex support
  */
@@ -501,6 +526,11 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
 /*
  * Use wxTextBuffer class
  */
@@ -726,6 +756,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
  */
@@ -834,7 +868,7 @@
 #define wxUSE_XPM 0
 
 /*
- * MS Icons and Cursors format support
+ * MS ICO (and CUR,ANI derivatives) image format support (on any platform)
  */
 #define wxUSE_ICO_CUR 0
 
@@ -860,6 +894,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
 
@@ -870,8 +907,8 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
-/* iconv()'s 2nd argument is char ** and not const char ** */
-#undef WX_ICONV_TAKES_CHAR
+/* Define if you have poll(2) function */
+#undef HAVE_POLL
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
@@ -885,6 +922,9 @@
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
+/* Define if you have support for large (64 bit size) files */
+#undef HAVE_LARGEFILE_SUPPORT
+
 /* Define if you have localtime() */
 #undef HAVE_LOCALTIME
 
@@ -933,6 +973,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
 
@@ -1020,12 +1063,12 @@
 /* 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
 
+/* Define if you have the fnmatch() function */
+#undef HAVE_FNMATCH
+
 /* Define if you have the <fnmatch.h> header file.  */
 #undef HAVE_FNMATCH_H
 
@@ -1056,11 +1099,11 @@
 /* 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
+/* Define if you have the <iconv.h> header file and iconv() symbol.  */
+#undef HAVE_ICONV
 
-/* Test for GLIBC 2.2 iconv() */
-#undef WX_ICONV_TAKES_CHAR
+/* Define as "const" if the declaration of iconv() needs const.  */
+#undef ICONV_CONST
 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H
@@ -1071,10 +1114,34 @@
 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS
 
+/* Define this if you have fputws() and putwc() */
+#undef HAVE_FPUTWC
+
+/* Define this if you have wprintf() and related functions */
+#undef HAVE_WPRINTF
+
+/* 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
 
 
+/* -------------------------------------------------------------------------
+   Win32 adjustments section
+   ------------------------------------------------------------------------- */
+
+#ifdef __WIN32__
+
+/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
+   with wx/msw/setup.h */
+#define wxUSE_XPM_IN_MSW wxUSE_XPM
+
+#endif /* __WIN32__ */
+
 /* --------------------------------------------------------*
  *  This stuff is static, it doesn't get modified directly
  *  by configure.