Whate are these still doing here? They shoul dhav ebeen removed 2

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index dff15d01346c238184cbe07710a914f128e2b9e4..3fc7b0de047e2c6dff34a59ab54fa7307d6d4a3c 100644 (file)
--- 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__
@@ -85,6 +85,9 @@
 #undef __DATA_GENERAL__
 #undef __EMX__
 
+/* NanoX (with wxX11) */
+#define wxUSE_NANOX 0
+
 /* PowerPC Darwin & Mac OS X */
 #undef __POWERPC__
 
@@ -110,6 +113,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 +129,11 @@
  */
 #undef HAVE_BOOL
 
+/*
+ * Define if your compiler supports the explicit keyword
+ */
+#undef HAVE_EXPLICIT
+
 /*
  * Use regex support
  */
@@ -501,6 +513,11 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
 /*
  * Use wxTextBuffer class
  */
@@ -818,6 +835,11 @@
  */
 #define wxUSE_PCX 0
 
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+
 /*
  * PNM image format support
  */
@@ -829,7 +851,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
 
@@ -865,9 +887,6 @@
 /* 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 pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 
@@ -880,6 +899,15 @@
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
+/* 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
 
@@ -1021,6 +1049,9 @@
 /* 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
 
@@ -1051,11 +1082,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