X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d216abcb491a6cf440a0bd97dbf32a5cf7fded..6c5d62917d14278d8925a73d754965713e11e32f:/include/wx/msw/setup0.h?ds=sidebyside diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index a494508e6c..ac2f4af6ef 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -13,7 +13,6 @@ #define _WX_SETUP_H_ /* --- start common options --- */ - // ---------------------------------------------------------------------------- // global settings // ---------------------------------------------------------------------------- @@ -28,15 +27,15 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.2 API: set it to 1 to +// This setting determines the compatibility with 2.4 API: set it to 1 to // enable it but please consider updating your code instead. // // Default is 0 // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_2 0 +#define WXWIN_COMPATIBILITY_2_4 0 -// This setting determines the compatibility with 2.4 API: set it to 0 to +// This setting determines the compatibility with 2.6 API: set it to 0 to // flag all cases of using deprecated functions. // // Default is 1 but please try building your code with 0 as the default will @@ -44,15 +43,16 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_4 1 +#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. +// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when +// default system font is used for wxWindow::GetCharWidth/Height() instead of +// the current font. // -// Default is 1 +// Default is 0 // -// Recommended setting: 0 (the new calculations are more correct!) -#define wxDIALOG_UNIT_COMPATIBILITY 1 +// Recommended setting: 0 +#define wxDIALOG_UNIT_COMPATIBILITY 0 // ---------------------------------------------------------------------------- // debugging settings @@ -123,7 +123,7 @@ #define wxUSE_ON_FATAL_EXCEPTION 1 // Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidumop created by wxCrashReport::Generate()) stack back +// machine-readable minidump created by wxCrashReport::Generate()) stack back // trace when your program crashes using wxStackWalker // // Default is 1 if supported by the compiler. @@ -131,6 +131,16 @@ // Recommended setting: 1, set to 0 if your programs never crash #define wxUSE_STACKWALKER 1 +// Set this to 1 to compile in wxDebugReport class which allows you to create +// and optionally upload to your web site a debug report consisting of back +// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. +// +// Default is 1 if supported by the compiler. +// +// Recommended setting: 1, it is compiled into a separate library so there +// is no overhead if you don't use it +#define wxUSE_DEBUGREPORT 1 + // ---------------------------------------------------------------------------- // Unicode support // ---------------------------------------------------------------------------- @@ -150,22 +160,6 @@ #define wxUSE_UNICODE 0 #endif -// 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/handson/dev/mslu_announce.mspx). Note -// that you will have to modify the makefiles to include unicows.lib import -// library as the first library (see installation instructions in install.txt -// to learn how to do it when building the library or samples). -// -// If your compiler doesn't have unicows.lib, you can get a version of it at -// http://libunicows.sourceforge.net -// -// Default is 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 // compiling the program in Unicode mode. More precisely, it will be possible // to construct wxString from a wide (Unicode) string and convert any wxString @@ -187,6 +181,9 @@ // code will lead to undefined behaviour -- but the code itself will be // slightly smaller and faster. // +// Note that like wxUSE_THREADS this option is automatically set to 0 if +// wxNO_EXCEPTIONS is defined. +// // Default is 1 // // Recommended setting: depends on whether you intend to use C++ exceptions @@ -240,7 +237,9 @@ // library without it if you have no use for it - this will result in a // somewhat smaller and faster operation. // -// This is ignored under Win16, threads are only supported under Win32. +// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset +// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in +// build/msw/config.* file this value will have no effect. // // Default is 1 // @@ -250,9 +249,12 @@ // If enabled (1), compiles wxWidgets streams classes #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation. +// Use standard C++ streams if 1. If 0, use wxWin streams implementation only. #define wxUSE_STD_IOSTREAM 0 +// Enable conversion to standard C++ string if 1. +#define wxUSE_STD_STRING 0 + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -287,6 +289,14 @@ // Recommended setting: 1 (but may be safely disabled if you don't use it) #define wxUSE_FSVOLUME 1 +// Use wxStandardPaths class which allows to retrieve some standard locations +// in the file system +// +// Default is 1 +// +// Recommended setting: 1 (may be disabled to save space, but not much) +#define wxUSE_STDPATHS 1 + // use wxTextBuffer class: required by wxTextFile #define wxUSE_TEXTBUFFER 1 @@ -385,6 +395,9 @@ // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) #define wxUSE_FS_INET 1 +// wxArchive classes for accessing archives such as zip and tar +#define wxUSE_ARCHIVE_STREAMS 1 + // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 @@ -459,19 +472,12 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use QuickTime +// Use GStreamer for Unix (req a lot of dependancies) // // 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 (requires linkage to strmiids.lib) -// -// Default is 0 -// -// Recommended setting: 1 if the DirectX 7 SDK is installed (highly recommended), else 0 -#define wxUSE_DIRECTSHOW 0 +// Recommended setting: 1 (wxMediaCtrl won't work by default without it) +#define wxUSE_GSTREAMER 0 // Use wxWidget's XRC XML-based resource system. Recommended. // @@ -569,11 +575,7 @@ // Default is 1 for the platforms where native status bar is supported. // // Recommended setting: 1 (there is no advantage in using the generic one) -#if defined(__WXMSW__) || defined(__WXMAC__) #define wxUSE_NATIVE_STATUSBAR 1 -#else -#define wxUSE_NATIVE_STATUSBAR 0 -#endif // wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar // classes at all. Otherwise, use the native toolbar class unless @@ -611,6 +613,22 @@ // Recommended setting: 1 #define wxUSE_CHOICEBOOK 1 +// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of +// the tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TREEBOOK 1 + +// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of +// tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_TOOLBOOK 1 + // wxTabDialog is a generic version of wxNotebook but it is incompatible with // the new class. It shouldn't be used in new code. // @@ -659,7 +677,7 @@ // 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 +#define wxUSE_DISPLAY 1 // Miscellaneous geometry code: needed for Canvas library #define wxUSE_GEOMETRY 1 @@ -851,6 +869,14 @@ // Recommended setting: 1 if you intend to use OpenGL, 0 otherwise #define wxUSE_GLCANVAS 0 +// wxRichTextCtrl allows editing of styled text. +// +// Default is 1. +// +// Recommended setting: 1, set to 0 if you want compile a +// smaller library. +#define wxUSE_RICHTEXT 1 + // ---------------------------------------------------------------------------- // Data transfer // ---------------------------------------------------------------------------- @@ -933,10 +959,6 @@ // Set to 1 to use font metric files in GetTextExtent #define wxUSE_AFM_FOR_POSTSCRIPT 1 -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -954,7 +976,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. @@ -1033,6 +1055,24 @@ // Windows-only settings // ---------------------------------------------------------------------------- +// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode +// and want to run your programs under Windows 9x and not only 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 (see installation instructions in install.txt +// to learn how to do it when building the library or samples). +// +// If your compiler doesn't have unicows.lib, you can get a version of it at +// http://libunicows.sourceforge.net +// +// Default is 0 +// +// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems) +#ifndef wxUSE_UNICODE_MSLU + #define wxUSE_UNICODE_MSLU 0 +#endif + // Set this to 1 if you want to use wxWidgets and MFC in the same program. This // will override some other settings (see below) // @@ -1060,13 +1100,9 @@ // Set this to 1 to enable wxDIB #define wxUSE_WXDIB 1 -// 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 -// -#define wxUSE_ITSY_BITSY 0 +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 // 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 @@ -1076,18 +1112,15 @@ // // Recommended setting: 1, only set it to 0 if your compiler doesn't have // or can't compile -#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 -// RichEdit 2.0 but do have RichEdit 1.0... +// Set this to 1 to use extra features of richedit v2 and later controls +// +// Default is 1 for compilers which support it +// +// Recommended setting: 1 #define wxUSE_RICHEDIT2 1 -#else -#define wxUSE_RICHEDIT 0 -#define wxUSE_RICHEDIT2 0 -#endif - // Set this to 1 to enable support for the owner-drawn menu and listboxes. This // is required by wxUSE_CHECKLISTBOX. // @@ -1103,6 +1136,9 @@ // (notably, wxNotebook pages) #define wxUSE_UXTHEME_AUTO 1 +// Set to 1 to use InkEdit control (Tablet PC), if available +#define wxUSE_INKEDIT 0 + // ---------------------------------------------------------------------------- // Generic versions of native controls // ---------------------------------------------------------------------------- @@ -1122,26 +1158,11 @@ // Set this to 1 to be able to use wxCrashReport::Generate() to create mini // dumps of your program when it crashes (or at any other moment) // -// Default is 1 if supported by the compiler. +// Default is 1 if supported by the compiler (VC++ and recent BC++ only). // // Recommended setting: 1, set to 0 if your programs never crash #define wxUSE_CRASHREPORT 1 - -// all of the settings below require SEH support (__try/__catch) and can't work -// without it -#if !defined(_MSC_VER) && \ - (!defined(__BORLANDC__) || __BORLANDC__ < 0x0550) - #undef wxUSE_ON_FATAL_EXCEPTION - #define wxUSE_ON_FATAL_EXCEPTION 0 - - #undef wxUSE_CRASHREPORT - #define wxUSE_CRASHREPORT 0 - - #undef wxUSE_STACKWALKER - #define wxUSE_STACKWALKER 0 -#endif // compiler doesn't support SEH - // ---------------------------------------------------------------------------- // obsolete settings // ---------------------------------------------------------------------------- @@ -1149,9 +1170,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