Fixed a crash when GetMonthControl returns NULL

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 1a15cfcc25d8f37ea4578f3bdc9d2f12650a5ad4..8aa901cba982a44193c07bd48c561e966c96c7a5 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
@@ -501,6 +508,11 @@
  * Use wxFFile class
  */
 #define wxUSE_FFILE 0
+/*
+ * Use wxFSVolume class
+ */
+#define wxUSE_FSVOLUME 1
+
 /*
  * Use wxTextBuffer class
  */
@@ -834,7 +846,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
 
@@ -870,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
 
@@ -1026,6 +1035,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
 
@@ -1056,11 +1068,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