X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eee02518db7d271c929acdd8d098f2a5c0d03d4..15bee36fdf12ec78f61e1372a460a7606f7ccb7e:/setup.h.in diff --git a/setup.h.in b/setup.h.in index e45a71b050..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__ @@ -74,6 +74,7 @@ #undef __SOLARIS__ #undef __SUNOS__ #undef __ALPHA__ +#undef __IA64__ #undef __OSF__ #undef __BSD__ #undef __FREEBSD__ @@ -84,23 +85,36 @@ #undef __DATA_GENERAL__ #undef __EMX__ +/* NanoX (with wxX11) */ +#define wxUSE_NANOX 0 + /* PowerPC Darwin & Mac OS X */ #undef __POWERPC__ +/* MS-DOS with DJGPP */ +#undef __DOS__ + /* Stupid hack; __WINDOWS__ clashes with wx/defs.h */ #ifndef __WINDOWS__ #undef __WINDOWS__ #endif #undef __WIN95__ +#ifndef __WIN32__ #undef __WIN32__ +#endif #undef __GNUWIN32__ #undef STRICT #undef WINVER /* enable native status bar under Win32 */ -#ifdef __WIN95__ +#if defined(__WIN95__) && !defined(__WXUNIVERSAL__) #define wxUSE_NATIVE_STATUSBAR 1 +#define wxUSE_OWNER_DRAWN 1 +#endif + +#if defined(__WXPM__) +#define wxUSE_OWNER_DRAWN 1 #endif /* enable rich edit under Win32 */ @@ -202,6 +216,11 @@ */ #define wxUSE_POPUPWIN 0 +/* + Use wxTipWindow + */ +#define wxUSE_TIPWINDOW 0 + /* * Use accelerators */ @@ -232,6 +251,11 @@ */ #define wxUSE_MIMETYPE 0 +/* + * Use wxSystemOptions + */ +#define wxUSE_SYSTEM_OPTIONS 0 + /* * Use wxMessageDialog (and wxMessageBox) */ @@ -405,7 +429,6 @@ /* * Use this control */ -#define wxUSE_STATUSBAR 0 #define wxUSE_STATTEXT 0 /* * Use this control @@ -444,7 +467,6 @@ #define wxUSE_TOOLBAR_SIMPLE 0 #if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__) -#define wxUSE_OWNER_DRAWN 1 #if wxUSE_TOOLBAR #define wxUSE_BUTTONBAR 1 #endif @@ -486,6 +508,15 @@ * Use wxFFile class */ #define wxUSE_FFILE 0 +/* + * Use wxFSVolume class + */ +#define wxUSE_FSVOLUME 1 + +/* + * Use wxTextBuffer class + */ +#define wxUSE_TEXTBUFFER 0 /* * Use wxTextFile class */ @@ -506,7 +537,7 @@ /* * Use old log dialog instead of new wxLogGui */ -#define wxUSE_LOG_DIALOG 1 +#define wxUSE_LOG_DIALOG 0 /* * Use wxStopWatch */ @@ -532,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 */ @@ -556,6 +590,10 @@ * wxLibrary class */ #define wxUSE_DYNLIB_CLASS 0 +/* + * Use wxObjectLoader + */ +#define wxUSE_DYNAMIC_LOADER 0 /* * Use wxTimer @@ -587,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. * @@ -635,10 +683,6 @@ * Use spline */ #define wxUSE_SPLINES 0 -/* - * Use wxLibrary class - */ -#define wxUSE_DYNLIB_CLASS 0 /* * Use the mdi architecture @@ -786,6 +830,11 @@ */ #define wxUSE_PCX 0 +/* + * IFF image format support + */ +#define wxUSE_IFF 0 + /* * PNM image format support */ @@ -796,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. @@ -828,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 @@ -873,6 +924,9 @@ /* define if you have statfs function */ #undef HAVE_STATFS +/* define if you have statvfs function */ +#undef HAVE_STATVFS + /* Define if you have strptime() */ #undef HAVE_STRPTIME @@ -945,6 +999,12 @@ /* Define if you have the inet_aton function. */ #undef HAVE_INET_ATON +/* Define if you have the mktemp function. */ +#undef HAVE_MKTEMP + +/* Define if you have the mkstemp function. */ +#undef HAVE_MKSTEMP + /* Define if you have the nanosleep function. */ #undef HAVE_NANOSLEEP @@ -1002,11 +1062,14 @@ /* Define if you have the header file. */ #undef HAVE_WCSTR_H -/* Define if you have the header file. */ -#undef HAVE_ICONV_H +/* Define if you have the header file. */ +#undef HAVE_WCTYPE_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