X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7ee20d36aff332914e4e57445552c609a3669d21..673e6120795e4e1f3a49157581925a5ee14bf5a9:/setup.h.in

diff --git a/setup.h.in b/setup.h.in
index abcfa513be..deffca77b9 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
 
@@ -58,6 +61,9 @@
 /* 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
  */
@@ -80,13 +86,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 +107,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__)
@@ -126,6 +145,16 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Define if your compiler supports the explicit keyword
+ */
+#undef HAVE_EXPLICIT
+
+/*
+ * Define if your compiler supports const_cast<>()
+ */
+#undef HAVE_CONST_CAST
+
 /*
  * Use regex support
  */
@@ -346,6 +375,10 @@
  * Use this control
  */
 #define wxUSE_CHOICE 0
+/*
+ * Use wxDisplay class
+ */
+#define wxUSE_DISPLAY 0
 /*
  * Use this control
  */
@@ -355,12 +388,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
 /*
@@ -505,6 +538,11 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
 /*
  * Use wxTextBuffer class
  */
@@ -730,6 +768,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
  */
@@ -864,6 +906,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
 
@@ -874,8 +919,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
@@ -889,6 +934,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
 
@@ -937,6 +985,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
 
@@ -1024,12 +1075,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
 
@@ -1060,11 +1111,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
@@ -1075,10 +1126,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.