A little different fix for how to delay the call to __wxCleanup

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 57922f4d85a982717673ed6e8649cacf16ba3c27..18dc7902db2bb94ec282ad78c0209884a5bc5d47 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -110,6 +110,10 @@
 #define wxUSE_OWNER_DRAWN 1
 #endif
 
 #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
 /* enable rich edit under Win32 */
 #if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1


@@ -818,6 +822,11 @@
  */
 #define wxUSE_PCX 0
 
  */
 #define wxUSE_PCX 0
 

+/*
+ * IFF image format support
+ */
+#define wxUSE_IFF 0
+

 /*
  * PNM image format support
  */
 /*
  * PNM image format support
  */


@@ -828,6 +837,11 @@
  */
 #define wxUSE_XPM 0
 
  */
 #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.
 /*
  * Disable this if your compiler can't cope
  * with omission of prototype parameters.


@@ -860,9 +874,6 @@
 /* struct tm doesn't always have the tm_gmtoff field, define this if it does */
 #undef WX_GMTOFF_IN_TM
 
 /* 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
 
 /* Define if you have pw_gecos field in struct passwd */
 #undef HAVE_PW_GECOS
 


@@ -1046,11 +1057,11 @@
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 
 /* 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
 
 /* Define if you have the <langinfo.h> header file.  */
 #undef HAVE_LANGINFO_H