X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a5d46b7362198fd94a5fd3b751df86287f2187bc..bbc3925a8a46e8c80b22277f5571dfb2465aca25:/setup.h.in?ds=sidebyside diff --git a/setup.h.in b/setup.h.in index 57922f4d85..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 */ @@ -818,6 +830,11 @@ */ #define wxUSE_PCX 0 +/* + * IFF image format support + */ +#define wxUSE_IFF 0 + /* * PNM image format support */ @@ -828,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. @@ -860,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 @@ -1046,11 +1065,11 @@ /* Define if you have the header file. */ #undef HAVE_WCTYPE_H -/* Define if you have the header file. */ -#undef HAVE_ICONV_H +/* Define if you have the 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 header file. */ #undef HAVE_LANGINFO_H