X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/62402193ce6c26987b8907c5e35d08a44714beb3..be7a101366995b7b7bb76e3d5b1e7dd8fc9a1af8:/include/wx/msw/setup0.h diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index a03583e71b..354ab7a76a 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_SETUP_H_ @@ -44,26 +44,23 @@ // Recommended setting: 0 (please update your code instead!) #define WXWIN_COMPATIBILITY_2 0 -// This setting determines the compatibility with 2.0 API: set it to 1 to -// enable it +// This setting determines the compatibility with 2.2 API: set it to 1 to +// enable it but please consider updating your code instead. // -// Default is 1. +// Default is 0 // -// Recommended setting: 0 (please update your code instead!) +// Recommended setting: 0 (please update your code) #define WXWIN_COMPATIBILITY_2_2 1 -// in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap, -// but this is very dangerous because you can mistakenly pass an icon instead -// of a bitmap to a function taking "const wxBitmap&" - which will *not* work -// because an icon is not a valid bitmap +// This setting determines the compatibility with 2.4 API: set it to 0 to +// flag all cases of using deprecated functions. // -// Starting from 2.1.12, you have the choice under this backwards compatible -// behaviour (your code will still compile, but probably won't behave as -// expected!) and not deriving wxIcon class from wxBitmap, but providing a -// conversion ctor wxBitmap(const wxIcon&) instead. +// Default is 1 but please try building your code with 0 as the default will +// change to 0 in the next version and the deprecated functions will disappear +// in the version after it completely. // -// Recommended setting: 0 -#define wxICON_IS_BITMAP 0 +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_2_4 1 // Define as 1 for font size to be backward compatible to 1.63 and earlier. // 1.64 and later define point sizes to be compatible with Windows. @@ -129,7 +126,7 @@ // In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If // this causes problems (e.g. link errors), set this to 0. You may need to set // this to 0 if using templates (at least for VC++). This switch is currently -// ignored for mingw / cygwin +// ignored for mingw / cygwin / CodeWarrior // // Default is 0 // @@ -161,28 +158,31 @@ // defined as wchar_t, wxString will use Unicode internally. If you set this // to 1, you must use wxT() macro for all literal strings in the program. // -// Unicode is currently only fully supported under Windows NT/2000/XP (Windows 9x -// doesn't support it and the programs compiled in Unicode mode will not run -// under 9x). +// Unicode is currently only fully supported under Windows NT/2000/XP +// (Windows 9x doesn't support it and the programs compiled in Unicode mode +// will not run under 9x -- but see wxUSE_UNICODE_MSLU below). // // Default is 0 // // Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) -#define wxUSE_UNICODE 0 +#ifndef wxUSE_UNICODE + #define wxUSE_UNICODE 0 +#endif // Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode -// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. This -// setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see -// http://www.microsoft.com/globaldev/Articles/mslu_announce.asp). Note that you -// will have to modify the makefiles to include unicows.lib import library as the first -// library. +// and be able to run compiled apps under Windows 9x as well as NT/2000/XP. +// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see +// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note that +// you will have to modify the makefiles to include unicows.lib import library +// as the first library (if you use MSVC, you can run the makefile with "nmake +// MSLU=1 UNICODE=1" command). // // If your compiler doesn't have unicows.lib, you can get a version of it at -// http://www.volny.cz/v.slavik/libunicows/ +// http://libunicows.sourceforge.net // // Default is 0 // -// Recommended setting: 0 +// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems) #define wxUSE_UNICODE_MSLU 0 // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without @@ -208,13 +208,6 @@ // Recommended setting: 1 (always) #define wxUSE_LOG 1 -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - // Recommended setting: 1 #define wxUSE_LOGWINDOW 1 @@ -224,6 +217,13 @@ // Recommended setting: 1 #define wxUSE_LOG_DIALOG 1 +// Support for command line parsing using wxCmdLineParser class. +// +// Default is 1 +// +// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) +#define wxUSE_CMDLINE_PARSER 1 + // Support for multithreaded applications: if 1, compile in thread classes // (thread.h) and make the library a bit more thread safe. Although thread // support is quite stable by now, you may still consider recompiling the @@ -304,15 +304,6 @@ // Recommended setting: 1 #define wxUSE_DATETIME 1 -// wxUSE_TIMEDATE enables compilation of the old wxDate and wxTime classes (not -// the same as wxDateTime!). These classes are obsolete and shouldn't be used -// in new code -// -// Default is 0 -// -// Recommended setting: 0 unless you have legacy code which uses these classes -#define wxUSE_TIMEDATE 0 - // Set wxUSE_TIMER to 1 to compile wxTimer class // // Default is 1 @@ -554,23 +545,13 @@ // Recommended setting: 0 (use wxNotebook) #define wxUSE_TAB_DIALOG 0 -// wxGrid class comes in two flavours: the original (pre wxWin 2.2) one and -// the new, much imporved and enhanced version. The new version is backwards -// compatible with the old one and should be used whenever possible, i.e. if -// you set wxUSE_GRID to 1, set wxUSE_NEW_GRID to 1 too. +// wxGrid class // // Default is 1 for both options. // -// Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using -// wxGrid and 100% backwards compatibality (with all old wxGrid quirks) is -// essential. +// Recommended setting: 1 // -// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. #define wxUSE_GRID 1 -#define wxUSE_NEW_GRID 1 - -// wxProperty[Value/Form/List] classes, used by Dialog Editor -#define wxUSE_PROPSHEET 0 // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff @@ -587,6 +568,14 @@ // Recommended setting: 1 (can be safely set to 0, not used by the library) #define wxUSE_CARET 1 +// Use wxDisplay class: it allows enumerating all displays on a system and +// working with them. +// +// Default is 0 because it isn't yet implemented on all platforms +// +// Recommended setting: 1 if you need it, can be safely set to 0 otherwise +#define wxUSE_DISPLAY 0 + // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 @@ -633,6 +622,10 @@ // wxDC cacheing implementation #define wxUSE_DC_CACHEING 1 +// Set this to 1 to enable the use of DIB's for wxBitmap to support +// bitmaps > 16MB on Win95/98/Me. Set to 0 to use DDB's only. +#define wxUSE_DIB_FOR_BITMAP 0 + // ---------------------------------------------------------------------------- // common dialogs // ---------------------------------------------------------------------------- @@ -767,12 +760,17 @@ // smaller library. #define wxUSE_HTML 1 -// OpenGL canvas +// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL +// headers and libraries to be able to compile the library with wxUSE_GLCANVAS +// set to 1. Note that for some compilers (notably Microsoft Visual C++) you +// will need to manually add opengl32.lib and glu32.lib to the list of +// libraries linked with your program if you use OpenGL. +// +// Default is 0. +// +// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise #define wxUSE_GLCANVAS 0 -// wxTreeLayout class -#define wxUSE_TREELAYOUT 1 - // ---------------------------------------------------------------------------- // Data transfer // ---------------------------------------------------------------------------- @@ -801,6 +799,14 @@ // Recommended setting: 1 #define wxUSE_DRAG_AND_DROP 1 +// Use wxAccessible for enhanced and customisable accessibility. +// Depends on wxUSE_OLE. +// +// Default is 0. +// +// Recommended setting (at present): 0 +#define wxUSE_ACCESSIBILITY 0 + // ---------------------------------------------------------------------------- // miscellaneous settings // ---------------------------------------------------------------------------- @@ -820,7 +826,7 @@ // 0 for no interprocess comms #define wxUSE_HELP 1 // 0 for no help facility -#define wxUSE_MS_HTML_HELP 0 +#define wxUSE_MS_HTML_HELP 1 // 0 for no MS HTML Help // Use wxHTML-based help controller? @@ -840,14 +846,6 @@ // 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 - // Use dynamic icon/cursor loading/saving code - // under MSW. -#define wxUSE_WX_RESOURCES 1 - // Use .wxr resource mechanism (requires PrologIO library) - #define wxUSE_MOUSEWHEEL 1 // Include mouse wheel support @@ -901,7 +899,9 @@ #define REMOVE_UNUSED_ARG 1 // VC++ 4.2 and above allows and but you can't mix -// them. Set to 1 for , 0 for +// them. Set to 1 for , 0 for . Note that VC++ 7.1 +// and later doesn't support wxUSE_IOSTREAMH == 1 and so will be +// used anyhow. // // Default is 1. // @@ -1007,7 +1007,7 @@ // // Recommended setting: 1, only set it to 0 if your compiler doesn't have // or can't compile -#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__) +#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__) #define wxUSE_RICHEDIT 1 // TODO: This should be ifdef'ed for any compilers that don't support @@ -1027,6 +1027,13 @@ // Recommended setting: 1, set to 0 for a small library size reduction #define wxUSE_OWNER_DRAWN 1 +// Set to 1 to compile MS Windows XP theme engine support +#define wxUSE_UXTHEME 1 + +// Set to 1 to auto-adapt to MS Windows XP themes where possible +// (notably, wxNotebook pages) +#define wxUSE_UXTHEME_AUTO 1 + // ---------------------------------------------------------------------------- // obsolete settings // ---------------------------------------------------------------------------- @@ -1049,13 +1056,19 @@ // ---------------------------------------------------------------------------- #ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +#if (defined(__WATCOMC__) && (__WATCOMC__ >= 1200)) || ((defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))) # define wxUSE_NORLANDER_HEADERS 1 #else # define wxUSE_NORLANDER_HEADERS 0 #endif #endif +// wxUSE_DEBUG_NEW_ALWAYS doesn't work with CodeWarrior +#if defined(__MWERKS__) + #undef wxUSE_DEBUG_NEW_ALWAYS + #define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + #if defined(__GNUWIN32__) // These don't work as expected for mingw32 and cygwin32 #undef wxUSE_MEMORY_TRACING @@ -1123,16 +1136,6 @@ #define wxUSE_OWNER_DRAWN 0 #endif // __SALFORDC__ -#ifdef __TWIN32__ - -#undef wxUSE_THREADS -#define wxUSE_THREADS 0 - -#undef wxUSE_ODBC -#define wxUSE_ODBC 0 - -#endif // __TWIN32__ - // BC++/Win16 can't cope with the amount of data in resource.cpp #if defined(__WIN16__) && defined(__BORLANDC__) #undef wxUSE_WX_RESOURCES @@ -1140,9 +1143,6 @@ #undef wxUSE_ODBC #define wxUSE_ODBC 0 - -#undef wxUSE_NEW_GRID -#define wxUSE_NEW_GRID 0 #endif #if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) @@ -1157,7 +1157,7 @@ #define wxUSE_DEBUG_NEW_ALWAYS 0 #endif -#if defined(__WXMSW__) && defined(__WATCOMC__) +#if defined(__WXMSW__) && (defined(__WATCOMC__) && __WATCOMC__ < 1200) /* #undef wxUSE_GLCANVAS #define wxUSE_GLCANVAS 0