X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/371a5b4e62eb415107e045588f614fa49e866e78..052da7d572c75d05207b53f515ed6623285dc841:/include/wx/msw/setup_microwin.h diff --git a/include/wx/msw/setup_microwin.h b/include/wx/msw/setup_microwin.h index 3e4e363b8a..8f291d8ecd 100644 --- a/include/wx/msw/setup_microwin.h +++ b/include/wx/msw/setup_microwin.h @@ -28,25 +28,7 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 1.68 API: -// Level 0: no backward compatibility, all new features -// Level 1: some extra methods are defined for compatibility. -// -// Default is 0. -// -// Recommended setting: 0 (in fact the compatibility code is now very minimal -// so there is little advantage to setting it to 1. -#define WXWIN_COMPATIBILITY 0 - -// This setting determines the compatibility with 2.0 API: set it to 1 to -// enable it -// -// Default is 0. -// -// 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 +// This setting determines the compatibility with 2.2 API: set it to 1 to // enable it // // Default is 1. @@ -54,27 +36,6 @@ // 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 0 -// -// Recommended setting: 0 -#define wxFONT_SIZE_COMPATIBILITY 0 - // 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. // @@ -90,7 +51,7 @@ // Generic comment about debugging settings: they are very useful if you don't // use any other memory leak detection tools such as Purify/BoundsChecker, but // are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWindows memory debugging subsystem built in since version 5.0 and you +// as wxWidgets memory debugging subsystem built in since version 5.0 and you // may prefer to use it instead of built in memory debugging code because it is // faster and more fool proof. // @@ -159,7 +120,7 @@ // Unicode support // ---------------------------------------------------------------------------- -// Set wxUSE_UNICODE to 1 to compile wxWindows in Unicode mode: wxChar will be +// Set wxUSE_UNICODE to 1 to compile wxWidgets in Unicode mode: wxChar will be // 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. // @@ -172,7 +133,7 @@ // Recommended setting: 0 (unless you only plan to use Windows NT/2000) #define wxUSE_UNICODE 0 -// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWindows in Unicode mode +// Set wxUSE_UNICODE_MSLU to 1 if you want to compile wxWidgets 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 @@ -236,7 +197,7 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 0 -// If enabled (1), compiles wxWindows streams classes +// If enabled (1), compiles wxWidgets streams classes #define wxUSE_STREAMS 1 // Use standard C++ streams if 1. If 0, use wxWin streams implementation. @@ -299,15 +260,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 @@ -387,7 +339,7 @@ // If enabled, the code written by Apple will be used to write, in a portable // way, float on the disk. See extended.c for the license which is different -// from wxWindows one. +// from wxWidgets one. // // Default is 1. // @@ -416,8 +368,48 @@ // contribute us a makefile for src/regex for it #define wxUSE_REGEX 0 -// wxWave class -#define wxUSE_WAVE 0 +// 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 @@ -446,7 +438,7 @@ // Recommended setting: 1 (may be set to 0) #define wxUSE_TIPWINDOW 1 -// Each of the settings below corresponds to one wxWindows control. They are +// Each of the settings below corresponds to one wxWidgets control. They are // all switched on by default but may be disabled if you are sure that your // program (including any standard dialogs it can show!) doesn't need them and // if you desperately want to save some space. If you use any of these you must @@ -510,9 +502,6 @@ #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 // putting everything in one huge dialog. It replaces wxTabControl and related @@ -531,20 +520,10 @@ // 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. -// -// 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. +// wxGrid class +// Default is 1 // -// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. #define wxUSE_GRID 0 -#define wxUSE_NEW_GRID 0 // wxProperty[Value/Form/List] classes, used by Dialog Editor #define wxUSE_PROPSHEET 0 @@ -614,15 +593,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. @@ -934,7 +904,7 @@ // Windows-only settings // ---------------------------------------------------------------------------- -// Set this to 1 if you want to use wxWindows and MFC in the same program. This +// Set this to 1 if you want to use wxWidgets and MFC in the same program. This // will override some other settings (see below) // // Default is 0. @@ -984,7 +954,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 @@ -1100,16 +1070,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