X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d174f457e6a3337d85dbfe1152308cf548e07fa3:/include/wx/msw/setup_microwin.h?ds=sidebyside diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h index 4d0ffb91c6..1919e8d729 100644 --- a/include/wx/msw/setup_microwin.h +++ b/include/wx/msw/setup_microwin.h @@ -28,34 +28,15 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.0 API: set it to 1 to -// enable it +// This setting determines the compatibility with 2.6 API: set it to 0 to +// flag all cases of using deprecated functions. // -// Default is 1. -// -// Recommended setting: 0 (please update your code instead!) -#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 -// -// 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. -// -// Recommended setting: 0 -#define wxICON_IS_BITMAP 0 - -// 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. +// 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. // -// Default is 0 -// -// Recommended setting: 0 -#define wxFONT_SIZE_COMPATIBILITY 0 +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_2_6 1 // Set to 0 for accurate dialog units, else 1 to be as per 2.1.16 and before. // If migrating between versions, your dialogs may seem to shrink. @@ -392,6 +373,46 @@ // wxSound class #define wxUSE_SOUND 0 +// Use wxMediaCtrl +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_MEDIACTRL 1 + +// Use QuickTime +// +// Default is 0 +// +// Recommended setting: 1 if you have the QT SDK installed and you need it, else 0 +#define wxUSE_QUICKTIME 0 + +// Use DirectShow +// +// Default is 0 +// +// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0 +#define wxUSE_DIRECTSHOW 1 + +// Use wxWidget's XRC XML-based resource system. Recommended. +// +// Default is 1 +// +// Recommended setting: 1 (requires wxUSE_XML) +#define wxUSE_XRC 1 + +// XML parsing classes. Note that their API will change in the future, so +// using wxXmlDocument and wxXmlNode in your app is not recommended. +// +// Default is 1 +// +// Recommended setting: 1 (required by XRC) +#if wxUSE_XRC +# define wxUSE_XML 1 +#else +# define wxUSE_XML 0 +#endif + // ---------------------------------------------------------------------------- // Individual GUI controls // ---------------------------------------------------------------------------- @@ -471,20 +492,13 @@ // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar // classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. Additionally, the generic toolbar class which -// supports some features which might not be supported by the native wxToolBar -// class may be compiled in if wxUSE_TOOLBAR_SIMPLE is 1. +// wxUSE_TOOLBAR_NATIVE is 0. // // Default is 1 for all settings. // -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE and 0 for -// wxUSE_TOOLBAR_SIMPLE (the default is 1 mainly for backwards compatibility). +// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. #define wxUSE_TOOLBAR 0 #define wxUSE_TOOLBAR_NATIVE 0 -#define wxUSE_TOOLBAR_SIMPLE 0 - -// this setting is obsolete, value is ignored -#define wxUSE_BUTTONBAR 0 // wxNotebook is a control with several "tabs" located on one of its sides. It // may be used ot logically organise the data presented to the user instead of @@ -577,15 +591,6 @@ // common dialogs // ---------------------------------------------------------------------------- -// Define 1 to use generic dialogs in Windows, even though they duplicate -// native common dialog (e.g. wxColourDialog). This is mainly useful for -// testing. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GENERIC_DIALOGS_IN_MSW 0 - // On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. // file selector, printer dialog). Switching this off also switches off the // printing architecture and interactive wxPrinterDC. @@ -801,10 +806,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 0 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -822,7 +823,7 @@ #define wxODBC_FWD_ONLY_CURSORS 1 // Default is 0. Set to 1 to use the deprecated classes, enum types, function, -// member variables. With a setting of 1, full backward compatability with the +// member variables. With a setting of 1, full backward compatibility with the // 2.0.x release is possible. It is STRONGLY recommended that this be set to 0, // as future development will be done only on the non-deprecated // functions/classes/member variables/etc. @@ -926,18 +927,9 @@ #define wxUSE_CTL3D 1 #endif -// Define as 1 to use Microsoft's ItsyBitsy small title bar library, for -// wxMiniFrame. This setting is only used for Win3.1; Win9x and NT use native -// miniframes support instead. -// -// Default is 0 for (most) Win32 (systems), 1 for Win16 -// -// Recommended setting: same as default -#if defined(__WIN95__) -#define wxUSE_ITSY_BITSY 0 -#else -#define wxUSE_ITSY_BITSY 1 -#endif +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 // Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH // which allows to put more than ~32Kb of text in it even under Win9x (NT @@ -974,9 +966,6 @@ // NB: all settings in this section are obsolete and should not be used/changed // at all, they will disappear -// Set to 1 to use PenWindows -#define wxUSE_PENWINDOWS 0 - // Define 1 to use bitmap messages. #define wxUSE_BITMAP_MESSAGE 1