X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f9bc168497ae6b431edd1cd571a688dd3314f87e..3fbcc7fce5cb170b1a7cbc9c22299e44152cb1f7:/setup.h.in

diff --git a/setup.h.in b/setup.h.in
index f10213dcda..5404666d87 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__
@@ -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
@@ -501,6 +508,11 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
 /*
  * Use wxTextBuffer class
  */
@@ -551,13 +563,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
  */
@@ -575,6 +590,10 @@
  * wxLibrary class
  */
 #define wxUSE_DYNLIB_CLASS 0
+/*
+ * Use wxObjectLoader
+ */
+#define wxUSE_DYNAMIC_LOADER 0
 
 /*
  * Use wxTimer
@@ -606,6 +625,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.
  *
@@ -654,10 +683,6 @@
  * Use spline
  */
 #define wxUSE_SPLINES 0
-/*
- * Use wxLibrary class
- */
-#define wxUSE_DYNLIB_CLASS 0
 
 /*
  * Use the mdi architecture
@@ -805,6 +830,11 @@
  */
 #define wxUSE_PCX 0
 
+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+
 /*
  * PNM image format support
  */
@@ -815,6 +845,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.
@@ -847,9 +882,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
 
@@ -1033,11 +1065,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