X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17e914373a348a6c1f432d06ecab0bced95773ac..bb650010c8200174ce824aaadac44e8e5ead194d:/setup.h.in diff --git a/setup.h.in b/setup.h.in index 0e9057241d..65759d96c3 100644 --- a/setup.h.in +++ b/setup.h.in @@ -65,6 +65,12 @@ /* Define this if your version of GTK+ is greater than 2.4 */ #undef __WXGTK24__ +/* Define this if your version of GTK+ is greater than 2.6 */ +#undef __WXGTK26__ + +/* Define this if your version of GTK+ is greater than 2.10 */ +#undef __WXGTK210__ + /* Define this if you want to use GPE features */ #undef __WXGPE__ @@ -122,9 +128,6 @@ #undef __WINDOWS__ #endif -#ifndef __WIN95__ -#undef __WIN95__ -#endif #ifndef __WIN32__ #undef __WIN32__ #endif @@ -148,10 +151,10 @@ #endif -#define WXWIN_COMPATIBILITY_2_4 0 - #define WXWIN_COMPATIBILITY_2_6 0 +#define WXWIN_COMPATIBILITY_2_8 0 + #define wxDIALOG_UNIT_COMPATIBILITY 0 @@ -200,7 +203,12 @@ #define wxUSE_STD_IOSTREAM 0 -#define wxUSE_STD_STRING 0 +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_STRING 0 +#else + #define wxUSE_STD_STRING 0 +#endif #define wxUSE_PRINTF_POS_PARAMS 0 @@ -242,12 +250,16 @@ #define wxUSE_FS_ZIP 0 +#define wxUSE_FS_ARCHIVE 0 + #define wxUSE_FS_INET 0 #define wxUSE_ARCHIVE_STREAMS 0 #define wxUSE_ZIPSTREAM 0 +#define wxUSE_TARSTREAM 0 + #define wxUSE_ZLIB 0 #define wxUSE_APPLE_IEEE 0 @@ -268,6 +280,8 @@ #define wxUSE_URL_NATIVE 0 +#define wxUSE_VARIANT 0 + #define wxUSE_REGEX 0 #define wxUSE_SYSTEM_OPTIONS 0 @@ -280,10 +294,13 @@ #define wxUSE_XRC 0 -#if wxUSE_XRC -#define wxUSE_XML 0 -#else -# define wxUSE_XML 0 +#define wxUSE_XML wxUSE_XRC + +#define wxUSE_AUI 0 + + +#ifndef wxUSE_GRAPHICS_CONTEXT +#define wxUSE_GRAPHICS_CONTEXT 0 #endif @@ -293,15 +310,21 @@ #define wxUSE_TIPWINDOW 0 +#define wxUSE_ANIMATIONCTRL 0 #define wxUSE_BUTTON 0 #define wxUSE_BMPBUTTON 0 #define wxUSE_CALENDARCTRL 0 #define wxUSE_CHECKBOX 0 #define wxUSE_CHECKLISTBOX 0 #define wxUSE_CHOICE 0 +#define wxUSE_COLLPANE 0 +#define wxUSE_COLOURPICKERCTRL 0 #define wxUSE_COMBOBOX 0 #define wxUSE_DATAVIEWCTRL 0 #define wxUSE_DATEPICKCTRL 0 +#define wxUSE_DIRPICKERCTRL 0 +#define wxUSE_FILEPICKERCTRL 0 +#define wxUSE_FONTPICKERCTRL 0 #define wxUSE_GAUGE 0 #define wxUSE_HYPERLINKCTRL 0 #define wxUSE_LISTBOX 0 @@ -309,6 +332,7 @@ #define wxUSE_RADIOBOX 0 #define wxUSE_RADIOBTN 0 #define wxUSE_SCROLLBAR 0 +#define wxUSE_SEARCHCTRL 0 #define wxUSE_SLIDER 0 #define wxUSE_SPINBTN 0 #define wxUSE_SPINCTRL 0 @@ -347,6 +371,8 @@ #define wxUSE_ODCOMBOBOX 0 +#define wxUSE_BITMAPCOMBOBOX 0 + #define wxUSE_ACCEL 0 @@ -402,6 +428,8 @@ #define wxUSE_WIZARDDLG 0 +#define wxUSE_ABOUTDLG 0 + #define wxUSE_METAFILE 0 #define wxUSE_ENH_METAFILE 0 @@ -440,6 +468,7 @@ #define wxUSE_HELP 0 + #define wxUSE_MS_HTML_HELP 0 @@ -483,6 +512,8 @@ #define wxUSE_LIBTIFF 0 +#define wxUSE_TGA 0 + #define wxUSE_GIF 0 #define wxUSE_PNM 0 @@ -497,17 +528,26 @@ #define wxUSE_PALETTE 0 + +#define wxUSE_ALL_THEMES 0 + +#define wxUSE_THEME_GTK 0 +#define wxUSE_THEME_METAL 0 +#define wxUSE_THEME_MONO 0 +#define wxUSE_THEME_WIN32 0 + + /* --- end common options --- */ /* for some features we don't have dedicated configure switches, so just choose * the common values automatically */ -#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__) +#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__) #define wxUSE_OWNER_DRAWN 1 #else #define wxUSE_OWNER_DRAWN 0 #endif -#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) +#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) #define wxUSE_RICHEDIT 1 #define wxUSE_RICHEDIT2 1 #else @@ -558,6 +598,11 @@ */ #undef VA_LIST_IS_ARRAY +/* + * Define if the compiler supports variadic macros + */ +#undef HAVE_VARIADIC_MACROS + /* * Define if your compiler has std::wstring */ @@ -681,9 +726,11 @@ */ #define wxUSE_X_RESOURCES 0 /* - * Use OLE (MSW only) + * Use OLE and OLE Automation (MSW only) */ #define wxUSE_OLE 0 +#define wxUSE_OLE_AUTOMATION 0 +#define wxUSE_ACTIVEX 0 /* for compatibility */ #define wxUSE_WX_RESOURCES wxUSE_RESOURCES @@ -714,6 +761,12 @@ */ #define CONST_COMPATIBILITY 0 +/* + * use the session manager to detect KDE/GNOME + */ +#define wxUSE_DETECT_SM 0 + + /* define with the name of timezone variable */ #undef WX_TIMEZONE @@ -754,6 +807,9 @@ /* Define if fsync() is available */ #undef HAVE_FSYNC +/* Define if round() is available */ +#undef HAVE_ROUND + /* Define if you have ftime() */ #undef HAVE_FTIME @@ -781,6 +837,9 @@ /* Define if you have pthread_cancel */ #undef HAVE_PTHREAD_CANCEL +/* Define if you have pthread_mutex_timedlock */ +#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK + /* Define if you have pthread_attr_setstacksize */ #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE @@ -803,6 +862,10 @@ * with 'char*' for the 3rd parameter instead of 'const char*' */ #undef HAVE_BROKEN_SNPRINTF_DECL +/* Define if you have a snprintf() which supports positional arguments + (defined in the unix98 standard) */ +#undef HAVE_UNIX98_PRINTF + /* define if you have statfs function */ #undef HAVE_STATFS @@ -818,6 +881,9 @@ /* Define if strptime() is declared in headers */ #undef HAVE_STRPTIME_DECL +/* Define if you have strtoull() and strtoll() */ +#undef HAVE_STRTOULL + /* Define if you have all functions to set thread priority */ #undef HAVE_THREAD_PRIORITY_FUNCTIONS @@ -840,6 +906,9 @@ /* Define if you have wcslen function */ #undef HAVE_WCSLEN +/* Define if you have wcstoull() and wcstoll() */ +#undef HAVE_WCSTOULL + /* define if you have vsscanf function */ #undef HAVE_VSSCANF @@ -996,6 +1065,9 @@ /* Define if you have the header file. */ #undef HAVE_WCTYPE_H +/* Define if you have (Solaris only) */ +#undef HAVE_WIDEC_H + /* Define if you have the header file and iconv() symbol. */ #undef HAVE_ICONV @@ -1041,7 +1113,14 @@ /* Define this if you have wprintf() and related functions */ #undef HAVE_WPRINTF -/* Define this if you have wprintf() and related functions */ +/* Define this if you have swprintf() */ +#undef HAVE_SWPRINTF + +/* Define if you have a _broken_ swprintf() declaration in the header, + * without a 'size_t max' parameter as second argument */ +#undef HAVE_BROKEN_SWPRINTF_DECL + +/* Define this if you have vswprintf() and related functions */ #undef HAVE_VSWPRINTF /* Define this if you have _vsnwprintf */ @@ -1068,6 +1147,12 @@ /* Define if you have Pango xft support */ #undef HAVE_PANGO_XFT +/* Define if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define if fdopen is available. */ +#undef HAVE_FDOPEN + /* ------------------------------------------------------------------------- Win32 adjustments section ------------------------------------------------------------------------- */ @@ -1083,6 +1168,13 @@ */ #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +/* When using an external jpeg library and the Windows headers already define + * boolean, define to the type used by the jpeg library for boolean. */ +#undef wxHACK_BOOLEAN + +/* Define if the header pbt.h is missing. */ +#undef NEED_PBT_H + #endif /* __WIN32__ */ /* --------------------------------------------------------* @@ -1101,6 +1193,5 @@ /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */ #undef wxHAS_WORKING_GTK_DC_BLIT - #endif /* __WX_SETUP_H__ */