corrected control update code

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 7b33cca04b9c0653357b92a1d95175a3284a9ef6..907a657216595e72b6e2b36189bb250c712e4a2f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -608,6 +608,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * wxImage support
+ */
+#define wxUSE_IMAGE 0
+
 /*
  * GIF image format support
  */
@@ -623,6 +628,11 @@
  */
 #define wxUSE_PNM 0
 
+/*
+ * XPM image format support
+ */
+#define wxUSE_XPM 0
+
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.
@@ -655,6 +665,9 @@
 /* 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
 
@@ -814,6 +827,9 @@
 /* Define if you have the <iconv.h> header file.  */
 #undef HAVE_ICONV_H
 
+/* Test for GLIBC 2.2 iconv() */
+#undef WX_ICONV_TAKES_CHAR
+
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H