X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d297e8ff2a593a5cf27cd1bd37d74390d5370762..5d644707ca96dcaa63dc5a24c9eb5c2b7ee0b50d:/include/wx/msw/setup0.h diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 1917753d95..6e4571f104 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -47,10 +47,10 @@ // This setting determines the compatibility with 2.0 API: set it to 1 to // enable it // -// Default is 0. +// Default is 1. // // Recommended setting: 0 (please update your code instead!) -#define WXWIN_COMPATIBILITY_2_2 0 +#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 @@ -97,14 +97,12 @@ // and if __NO_VC_CRTDBG__ is not defined. // If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use normal memory operators. It's -// recommended to set this to 1, since you may well need to output an error log -// in a production version (or non-debugging beta). +// __WXDEBUG__ is not defined, will still use the normal memory operators. // -// Default is 1. +// Default is 0 // -// Recommended setting: 1 but see comment above -#define wxUSE_DEBUG_CONTEXT 1 +// Recommended setting: 0 +#define wxUSE_DEBUG_CONTEXT 0 // If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* // __WXDEBUG__ is also defined. @@ -112,29 +110,31 @@ // WARNING: this code may not work with all architectures, especially if // alignment is an issue. This switch is currently ignored for mingw / cygwin // -// Default is 1 +// Default is 0 // -// Recommended setting: 1 but see comment in the beginning of this section -#define wxUSE_MEMORY_TRACING 1 +// Recommended setting: 1 if you are not using a memory debugging tool, else 0 +#define wxUSE_MEMORY_TRACING 0 // In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors), set this to 0. +// If this causes problems (e.g. link errors which is a common problem +// especially if you use another library which also redefines the global new +// and delete), set this to 0. // This switch is currently ignored for mingw / cygwin // -// Default is 1 +// Default is 0 // -// Recommended setting: 1 but see comment in the beginning of this section -#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 +// Recommended setting: 0 +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 // 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 1 +// Default is 0 // -// Recommended setting: 1 but see comment in the beginning of this section -#define wxUSE_DEBUG_NEW_ALWAYS 1 +// Recommended setting: 0 +#define wxUSE_DEBUG_NEW_ALWAYS 0 // wxHandleFatalExceptions() may be used to catch the program faults at run // time and, instead of terminating the program with a usual GPF message box, @@ -177,6 +177,9 @@ // will have to modify the makefiles to include unicows.lib import library as the first // library. // +// If your compiler doesn't have unicows.lib, you can get a version of it at +// http://www.volny.cz/v.slavik/libunicows/ +// // Default is 0 // // Recommended setting: 0 @@ -267,6 +270,13 @@ #define wxUSE_FILE 1 #define wxUSE_FFILE 1 +// Use wxFSVolume class providing access to the configured/active mount points +// +// Default is 1 +// +// Recommended setting: 1 (but may be safely disabled if you don't use it) +#define wxUSE_FSVOLUME 1 + // use wxTextBuffer class: required by wxTextFile #define wxUSE_TEXTBUFFER 1 @@ -810,7 +820,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? @@ -1046,6 +1056,12 @@ #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 @@ -1076,12 +1092,6 @@ #define wxUSE_DEBUG_NEW_ALWAYS 0 #endif // wxUSE_MFC -// ODBC classes aren't Unicode-compatible yet -#if wxUSE_UNICODE -#undef wxUSE_ODBC -#define wxUSE_ODBC 0 -#endif - #if (!defined(WIN32) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !wxUSE_NORLANDER_HEADERS) // Can't use OLE drag and drop in Windows 3.1 because we don't know how // to implement UUIDs @@ -1209,40 +1219,5 @@ #endif // Win16 -// ---------------------------------------------------------------------------- -// undef the things which don't make sense for wxBase build -// ---------------------------------------------------------------------------- - -#if !wxUSE_GUI - -#undef wxUSE_HTML -#define wxUSE_HTML 0 - -#endif // !wxUSE_GUI - -// ---------------------------------------------------------------------------- -// check the settings consistency: do it here to abort compilation immediately -// and not almost in the very end when the relevant file fails to compile and -// you need to modify setup.h and rebuild everything -// ---------------------------------------------------------------------------- - -#if wxUSE_DATETIME && !wxUSE_LONGLONG - #error wxDateTime requires wxLongLong -#endif - -#if wxUSE_TEXTFILE && !wxUSE_FILE - #error You cannot compile wxTextFile without wxFile -#endif - -#if wxUSE_FILESYSTEM && !wxUSE_STREAMS - #error You cannot compile virtual file systems without wxUSE_STREAMS -#endif - -#if wxUSE_HTML && !wxUSE_FILESYSTEM - #error You cannot compile wxHTML without virtual file systems -#endif - -// add more tests here... - #endif // _WX_SETUP_H_