X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dffd81262026d5f375a9acd0dcf131a1b201943d..b668a73527cd08aae1321bfb1c604c9b96fffbed:/include/wx/msw/setup0.h diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index f5cab0b6e9..7151536181 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -519,11 +519,6 @@ #define wxUSE_DRAG_AND_DROP 1 // 0 for no drag and drop -#define wxUSE_XPM_IN_MSW 1 - // 0 for no XPM support in wxBitmap. - // Default is 1, as XPM is now fully - // supported this makes easier the issue - // of portable icons and bitmaps. #define wxUSE_IMAGE_LOADING_IN_MSW 1 // Use dynamic DIB loading/saving code in utils/dib under MSW. #define wxUSE_RESOURCE_LOADING_IN_MSW 1 @@ -532,6 +527,9 @@ #define wxUSE_WX_RESOURCES 1 // Use .wxr resource mechanism (requires PrologIO library) +#define wxUSE_MOUSEWHEEL 1 + // Include mouse wheel support + // ---------------------------------------------------------------------------- // postscript support settings // ---------------------------------------------------------------------------- @@ -555,10 +553,10 @@ // For backward compatibility reasons, this parameter now only controls the // default scrolling method used by cursors. This default behavior can be -// overriden by setting the second param of wxDB::wxDbGetConnection() or +// overriden by setting the second param of wxDB::wxDbGetConnection() or // wxDb() constructor to indicate whether the connection (and any wxDbTable()s -// that use the connection) should support forward only scrolling of cursors, -// or both forward and backward support for backward scrolling cursors is +// that use the connection) should support forward only scrolling of cursors, +// or both forward and backward support for backward scrolling cursors is // dependent on the data source as well as the ODBC driver being used. #define wxODBC_FWD_ONLY_CURSORS 1 @@ -601,6 +599,9 @@ // Some formats require an extra library which is included in wxWin sources // which is mentioned if it is the case. +// Set to 1 for wxImage support (recommended). +#define wxUSE_IMAGE 1 + // Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. #define wxUSE_LIBPNG 1 @@ -619,6 +620,9 @@ // Set to 1 for PCX format support #define wxUSE_PCX 1 +// Set to 1 for XPM format support +#define wxUSE_XPM 1 + // ---------------------------------------------------------------------------- // Windows-only settings // ---------------------------------------------------------------------------- @@ -727,9 +731,6 @@ #undef wxUSE_DEBUG_NEW_ALWAYS #define wxUSE_DEBUG_NEW_ALWAYS 0 -#undef wxUSE_MS_HTML_HELP -#define wxUSE_MS_HTML_HELP 0 - // Cygwin betas don't have wcslen #if defined(__CYGWIN__) || defined(__CYGWIN32__) # if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) @@ -820,12 +821,6 @@ #define wxUSE_LIBJPEG 0 #endif -#if defined(__BORLANDC__) -// Need a BC++-specific htmlhelp.lib before we can enable this -#undef wxUSE_MS_HTML_HELP -#define wxUSE_MS_HTML_HELP 0 -#endif - // wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode #if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL)) #undef wxUSE_DEBUG_NEW_ALWAYS @@ -838,9 +833,6 @@ #define wxUSE_GLCANVAS 0 */ -#undef wxUSE_MS_HTML_HELP -#define wxUSE_MS_HTML_HELP 0 - #undef wxUSE_WCHAR_T #define wxUSE_WCHAR_T 0 #endif