X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/babc97583e1280ac0992ca8e3dbd7604e2d3963b..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/msw/setup0.h?ds=sidebyside diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 04261d844a..2f4fb7f723 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -16,8 +16,11 @@ // global settings // ---------------------------------------------------------------------------- -// define this to 0 when building wxBase library -#define wxUSE_GUI 1 +// define this to 0 when building wxBase library - this can also be done from +// makefile/project file overriding the value here +#ifndef wxUSE_GUI + #define wxUSE_GUI 1 +#endif // wxUSE_GUI // ---------------------------------------------------------------------------- // compatibility settings @@ -46,6 +49,140 @@ // Recommended setting: 0 #define wxICON_IS_BITMAP 0 +// ---------------------------------------------------------------------------- +// debugging settings +// ---------------------------------------------------------------------------- + +// 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 +// may prefer to use it instead of built in memory debugging code because it is +// faster and more fool proof. +// +// Using VC++ CRT memory debugging is enabled by default in debug mode +// (__WXDEBUG__) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) +// 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). +// +// Default is 1. +// +// Recommended setting: 1 but see comment above +#define wxUSE_DEBUG_CONTEXT 1 + +// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* +// __WXDEBUG__ is also defined. +// +// 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 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_MEMORY_TRACING 1 + +// In debug mode, cause new and delete to be redefined globally. +// If this causes problems (e.g. link errors), set this to 0. +// This switch is currently ignored for mingw / cygwin +// +// Default is 1 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 + +// 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 +// +// Default is 1 +// +// Recommended setting: 1 but see comment in the beginning of this section +#define wxUSE_DEBUG_NEW_ALWAYS 1 + +// wxHandleFatalExceptions() may be used to catch the program faults at run +// time and, instead of terminating the program with a usual GPF message box, +// call the user-defined wxApp::OnFatalException() function. If you set +// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. +// +// This setting is for Win32 only and can only be enabled if your compiler +// supports Win32 structured exception handling (currently only VC++ does) +// +// Default is 1 +// +// Recommended setting: 1 if your compiler supports it. +#ifdef _MSC_VER + #define wxUSE_ON_FATAL_EXCEPTION 1 +#else + #define wxUSE_ON_FATAL_EXCEPTION 0 +#endif + +// ---------------------------------------------------------------------------- +// Unicode support +// ---------------------------------------------------------------------------- + +// Set wxUSE_UNICODE to 1 to compile wxWindows 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. +// +// Unicode is currently only fully supported under Windows NT/2000 (Windows 9x +// doesn't support it and the programs compiled in Unicode mode will not run +// under 9x). +// +// Default is 0 +// +// Recommended setting: 0 (unless you only plan to use Windows NT/2000) +#define wxUSE_UNICODE 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 +// to Unicode. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_WCHAR_T 1 + +// ---------------------------------------------------------------------------- +// global features +// ---------------------------------------------------------------------------- + +// Support for message/error logging. This includes wxLogXXX() functions and +// wxLog and derived classes. Don't set this to 0 unless you really know what +// you are doing. +// +// Default is 1 +// +// Recommended setting: 1 (always) +#define wxUSE_LOG 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 +// 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. +// +// Default is 1 +// +// Recommended setting: 0 unless you do plan to develop MT applications +#define wxUSE_THREADS 1 + +// If enabled (1), compiles wxWindows streams classes +#define wxUSE_STREAMS 1 + +// Use standard C++ streams if 1. If 0, use wxWin streams implementation. +#define wxUSE_STD_IOSTREAM 0 + +// Use serialization (requires utils/serialize) +#define wxUSE_SERIAL 0 + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -110,6 +247,45 @@ // Recommended setting: 1 #define wxUSE_DIALUP_MANAGER 1 +// Compile in wxLibrary class for run-time DLL loading and function calling +// +// This setting is for Win32 only +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_DYNLIB_CLASS 1 + +// Set to 1 to use socket classes +#define wxUSE_SOCKETS 1 + +// Set to 1 to enable virtual file systems +// (needed by wxHTML) +#define wxUSE_FILESYSTEM 1 +#define wxUSE_FS_ZIP 1 +#define wxUSE_FS_INET 1 + +// input stream for reading from zip archives +#define wxUSE_ZIPSTREAM 1 + +#define wxUSE_APPLE_IEEE 1 + // if enabled, the float codec written by Apple + // will be used to write, in a portable way, + // float on the disk + +// use wxFile class - required by i18n code, wxConfig and others - recommended +#define wxUSE_FILE 1 + +// use wxTextFile class: requires wxFile, required by wxConfig +#define wxUSE_TEXTFILE 1 + +// i18n support: _() macro, wxLocale class. Requires wxFile +#define wxUSE_INTL 1 + +#define wxUSE_DYNAMIC_CLASSES 1 + // If 1, enables provision of run-time type information. + // NOW MANDATORY: don't change. + // ---------------------------------------------------------------------------- // Optional controls // ---------------------------------------------------------------------------- @@ -154,11 +330,23 @@ #define wxUSE_LISTBOX 1 #define wxUSE_RADIOBOX 1 #define wxUSE_RADIOBTN 1 +#define wxUSE_SASH 1 // wxSashWindow #define wxUSE_SCROLLBAR 1 #define wxUSE_SLIDER 1 #define wxUSE_SPINBTN 1 #define wxUSE_SPINCTRL 1 #define wxUSE_STATLINE 1 +#define wxUSE_STATUSBAR 1 +#define wxUSE_TOOLTIPS 1 // wxToolTip and wxWindow::SetToolTip() + +// Two status bar implementations are available under Win32: the generic one +// or the wrapper around native control. For native look and feel the native +// version should be used. +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_NATIVE_STATUSBAR 1 // this setting is obsolete, value is ignored #define wxUSE_BUTTONBAR 1 @@ -173,9 +361,55 @@ // Recommended setting: 1 for wxUSE_NEW_GRID, 0 if you have an old code using // wxGrid and 100% backwards compatible (with all old wxGrid quirks) is // essential. +// +// WIN16/BC++ resets wxUSE_NEW_GRID to 0 because it exceeds the data limit. #define wxUSE_GRID 1 #define wxUSE_NEW_GRID 1 +// wxValidator class and related methods +#define wxUSE_VALIDATORS 1 + +// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) +#define wxUSE_ACCEL 1 + +// ---------------------------------------------------------------------------- +// 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. +// +// Default is 1 +// +// Recommended setting: 1 (unless it really doesn't work) +#define wxUSE_COMMON_DIALOGS 1 + +// text entry dialog and wxGetTextFromUser function +#define wxUSE_TEXTDLG 1 + +// progress dialog class for lengthy operations +#define wxUSE_PROGRESSDLG 1 + +// wxBusyInfo displays window with message when app is busy. Works in same way +// as wxBusyCursor +#define wxUSE_BUSYINFO 1 + +// wxDirDlg class for getting a directory name from user +#define wxUSE_DIRDLG 1 + +// support for startup tips (wxShowTip &c) +#define wxUSE_STARTUP_TIPS 1 + // ---------------------------------------------------------------------------- // Metafiles support // ---------------------------------------------------------------------------- @@ -201,6 +435,15 @@ // Big GUI components // ---------------------------------------------------------------------------- +// Set to 0 to disable document/view architecture +#define wxUSE_DOC_VIEW_ARCHITECTURE 1 + +// Set to 0 to disable MDI document/view architecture +#define wxUSE_MDI_ARCHITECTURE 1 + +// Set to 0 to disable print/preview architecture code +#define wxUSE_PRINTING_ARCHITECTURE 1 + // wxHTML sublibrary allows to display HTML in wxWindow programs and much, // much more. // @@ -224,18 +467,15 @@ #define wxUSE_TREELAYOUT 1 // ---------------------------------------------------------------------------- -// Postscript support settings +// miscellaneous settings // ---------------------------------------------------------------------------- -#define wxUSE_POSTSCRIPT 0 - // 0 for no PostScript device context -#define wxUSE_AFM_FOR_POSTSCRIPT 0 - // 1 to use font metric files in GetTextExtent #define wxUSE_IPC 1 // 0 for no interprocess comms -// Note: wxHELP uses IPC under X so these are interdependent! #define wxUSE_HELP 1 // 0 for no help facility +#define wxUSE_MS_HTML_HELP 0 + // 0 for no MS HTML Help #define wxUSE_RESOURCES 1 // 0 for no wxGetResource/wxWriteResource #define wxUSE_CONSTRAINTS 1 @@ -251,7 +491,10 @@ // 0 for no drag and drop #define wxUSE_XPM_IN_MSW 1 - // Define 1 to support the XPM package in wxBitmap. + // 0 for no XPM support in wxBitmap. + // Default is 1, as XPM is now fully + // 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 @@ -260,49 +503,22 @@ #define wxUSE_WX_RESOURCES 1 // Use .wxr resource mechanism (requires PrologIO library) -#define wxUSE_STARTUP_TIPS 1 - // support for startup tips (wxShowTip &c) +// ---------------------------------------------------------------------------- +// Postscript support settings +// ---------------------------------------------------------------------------- + +#define wxUSE_POSTSCRIPT 0 + // 0 for no PostScript device context +#define wxUSE_AFM_FOR_POSTSCRIPT 0 + // 1 to use font metric files in GetTextExtent -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - // Set to 0 to disable document/view architecture -#define wxUSE_MDI_ARCHITECTURE 1 - // Set to 0 to disable MDI document/view architecture -#define wxUSE_PRINTING_ARCHITECTURE 1 - // Set to 0 to disable print/preview architecture code #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 // Set to 0 to disable PostScript print/preview architecture code // under Windows (just use Windows printing). -#define wxUSE_DYNAMIC_CLASSES 1 - // If 1, enables provision of run-time type information. - // NOW MANDATORY: don't change. -#define wxUSE_MEMORY_TRACING 1 - // If 1, enables debugging versions of wxObject::new and - // wxObject::delete *IF* __WXDEBUG__ is also defined. - // WARNING: this code may not work with all architectures, especially - // if alignment is an issue. -#define wxUSE_DEBUG_CONTEXT 1 - // 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) -#define wxUSE_GLOBAL_MEMORY_OPERATORS 1 - // In debug mode, cause new and delete to be redefined globally. - // If this causes problems (e.g. link errors), set this to 0. - -#define wxUSE_DEBUG_NEW_ALWAYS 1 - // 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++). -#define REMOVE_UNUSED_ARG 1 - // Set this to 0 if your compiler can't cope - // with omission of prototype parameters. +// ---------------------------------------------------------------------------- +// database classes +// ---------------------------------------------------------------------------- #define wxUSE_ODBC 0 // Define 1 to use ODBC classes @@ -314,40 +530,48 @@ // of wxDB::GetDbConnection() to indicate whether the connection // (and any wxTable()s that use the connection) should support // forward only scrolling of cursors, or both forward and backward - // Support for backward scrolling cursors is dependent on the + // Support for backward scrolling cursors is dependent on the // data source as well as the ODBC driver being used. -#ifndef __MWERKS__ -#define wxUSE_IOSTREAMH 1 -#else +#define wxODBC_BACKWARD_COMPATABILITY 0 + // 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 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. + +// ---------------------------------------------------------------------------- +// other compiler (mis)features +// ---------------------------------------------------------------------------- + +// Set this to 0 if your compiler can't cope with omission of prototype +// parameters. +// +// Default is 1. +// +// Recommended setting: 1 (should never need to set this to 0) +#define REMOVE_UNUSED_ARG 1 + +// VC++ 4.2 and above allows and but you can't mix +// them. Set to 1 for , 0 for +// +// Default is 1. +// +// Recommended setting: whatever your compiler likes more #define wxUSE_IOSTREAMH 1 -#endif - // VC++ 4.2 and above allows and - // but you can't mix them. Set to 1 for , - // 0 for -#define wxUSE_STREAMS 1 - // If enabled (1), compiles wxWindows streams classes +// ---------------------------------------------------------------------------- +// image format support +// ---------------------------------------------------------------------------- -#define wxUSE_STD_IOSTREAM 0 - // Use standard C++ streams if 1. If 0, use wxWin - // streams implementation. - -#define wxUSE_WXCONFIG 1 - // if enabled, compiles built-in OS independent wxConfig - // class and it's file (any platform) and registry (Win) - // based implementations -#define wxUSE_THREADS 1 - // support for multithreaded applications: if - // 1, compile in thread classes (thread.h) - // and make the library thread safe #define wxUSE_ZLIB 1 // Use zlib for compression in streams and PNG code #define wxUSE_LIBPNG 1 // Use PNG bitmap/image code #define wxUSE_LIBJPEG 1 // Use JPEG bitmap/image code -#define wxUSE_LIBTIFF 0 +#define wxUSE_LIBTIFF 1 // Use TIFF bitmap/image code #define wxUSE_GIF 1 // Use GIF bitmap/image code @@ -355,87 +579,22 @@ // Use PNM bitmap/image code #define wxUSE_PCX 1 // Use PCX bitmap/image code -#define wxUSE_SERIAL 0 - // Use serialization (requires utils/serialize) -#define wxUSE_DYNLIB_CLASS 1 - // Compile in wxLibrary class for run-time - // DLL loading and function calling -#define wxUSE_TOOLTIPS 1 - // Define to use wxToolTip class and - // wxWindow::SetToolTip() method -#define wxUSE_SOCKETS 1 - // Set to 1 to use socket classes -#define wxUSE_FILESYSTEM 1 - // Set to 1 to enable virtual file systems - // (needed by wxHTML) -#define wxUSE_FS_ZIP 1 -#define wxUSE_FS_INET 1 - // Set to 1 to enable virtual file systems - -#define wxUSE_BUSYINFO 1 - // wxBusyInfo displays window with message - // when app is busy. Works in same way as - // wxBusyCursor -#define wxUSE_ZIPSTREAM 1 - // input stream for reading from zip archives - -/* - * Finer detail - * - */ - -#define wxUSE_APPLE_IEEE 1 - // if enabled, the float codec written by Apple - // will be used to write, in a portable way, - // float on the disk - -// use wxFile class - required by i18n code, wxConfig and others - recommended -#define wxUSE_FILE 1 - -// use wxTextFile class: requires wxFile, required by wxConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxFile -#define wxUSE_INTL 1 - -// wxLogXXX functions - highly recommended -#define wxUSE_LOG 1 - -// wxValidator class -#define wxUSE_VALIDATORS 1 - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// wxSashWindow class -#define wxUSE_SASH 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// wxStatusBar class -#define wxUSE_STATUSBAR 1 -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 +// ---------------------------------------------------------------------------- +// Windows-only settings +// ---------------------------------------------------------------------------- -/* - * MS Windows/Windows NT - * - */ +// Make settings compatible with MFC +#define wxUSE_MFC 0 +// required for drag-and-drop, clipboard, OLE Automation #define wxUSE_OLE 1 - // drag-and-drop, clipboard, OLE Automation #if defined(__WIN95__) #define wxUSE_CTL3D 0 #else +// Define 1 to use Microsoft CTL3D library. #define wxUSE_CTL3D 1 - // Define 1 to use Microsoft CTL3D library. - // See note above about using FAFA and CTL3D. #endif // can we use RICHEDIT control? @@ -445,55 +604,75 @@ #define wxUSE_RICHEDIT 0 #endif -#define wxUSE_COMMON_DIALOGS 1 - // 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. #define wxUSE_ITSY_BITSY 1 // Define 1 to use Microsoft's ItsyBitsy - // small title bar library, for wxMiniFrame + // small title bar library, for wxMiniFrame. + // This setting is only used for Win3.1; + // Win9x and NT use native miniframes + // support instead. #define wxUSE_BITMAP_MESSAGE 1 // Define 1 to use bitmap messages. -#define wxUSE_PORTABLE_FONTS_IN_MSW 0 - // Define 1 to use new portable font scheme in Windows - // (used by default under X) #define wxFONT_SIZE_COMPATIBILITY 0 // Define 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. -#define wxUSE_GENERIC_DIALOGS_IN_MSW 1 - // Define 1 to use generic dialogs in Windows, even though - // they duplicate native common dialog (e.g. wxColourDialog) -#define wxUSE_PENWINDOWS 0 +#define wxDIALOG_UNIT_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. +#define wxUSE_PENWINDOWS 0 // Set to 1 to use PenWindows #define wxUSE_OWNER_DRAWN 1 // Owner-drawn menus and listboxes -#define wxUSE_NATIVE_STATUSBAR 1 - // Set to 0 to use cross-platform wxStatusBar - -/* - * Any platform - * - */ - -#define wxUSE_TYPEDEFS 0 - // Use typedefs not classes for wxPoint - // and others, to reduce overhead and avoid - // MS C7 memory bug. Bounds checker - // complains about deallocating - // arrays of wxPoints if wxPoint is a class. - #if defined(__MINGW32__) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) #ifndef wxUSE_NORLANDER_HEADERS # define wxUSE_NORLANDER_HEADERS 1 #endif #endif +// ---------------------------------------------------------------------------- +// disable the settings which don't work for some compilers +// ---------------------------------------------------------------------------- + +#if defined(__GNUWIN32__) +// These don't work as expected for mingw32 and cygwin32 +#undef wxUSE_MEMORY_TRACING +#define wxUSE_MEMORY_TRACING 0 + +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 + +#undef wxUSE_MS_HTML_HELP +#define wxUSE_MS_HTML_HELP 0 + +#endif // __GNUWIN32__ + +// Cygwin b20 doesn't have wcslen +#if defined(__GNUWIN32__) && !defined(__MINGW32__) +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 0 +#endif + +// MFC duplicates these operators +#if wxUSE_MFC +#undef wxUSE_GLOBAL_MEMORY_OPERATORS +#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 + +#undef wxUSE_DEBUG_NEW_ALWAYS +#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 @@ -508,6 +687,11 @@ #define wxUSE_NATIVE_STATUSBAR 0 #endif +#if !wxUSE_OWNER_DRAWN +#undef wxUSE_CHECKLISTBOX +#define wxUSE_CHECKLISTBOX 0 +#endif + // Salford C++ doesn't like some of the memory operator definitions #ifdef __SALFORDC__ #undef wxUSE_MEMORY_TRACING @@ -524,7 +708,7 @@ #undef wxUSE_OWNER_DRAWN #define wxUSE_OWNER_DRAWN 0 -#endif +#endif // __SALFORDC__ #ifdef __TWIN32__ @@ -534,7 +718,7 @@ #undef wxUSE_ODBC #define wxUSE_ODBC 0 -#endif +#endif // __TWIN32__ // BC++/Win16 can't cope with the amount of data in resource.cpp #if defined(__WIN16__) && defined(__BORLANDC__) @@ -543,13 +727,42 @@ #undef wxUSE_ODBC #define wxUSE_ODBC 0 + +#undef wxUSE_NEW_GRID +#define wxUSE_NEW_GRID 0 #endif -#if defined(__WXMSW__) && defined(__WATCOMC__) +#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) +// BC++ 4.0 can't compile JPEG library #undef wxUSE_LIBJPEG #define wxUSE_LIBJPEG 0 #endif +#if defined(__BORLANDC__) +// Need a BC++-specific htmlhelp.lib before we can enable this +#undef wxUSE_MS_HTML_HELP +#define wxUSE_MS_HTML_HELP 0 +#endif + +// wxUSE_DBEUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode +#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL)) +#undef wxUSE_DEBUG_NEW_ALWAYS +#define wxUSE_DEBUG_NEW_ALWAYS 0 +#endif + +#if defined(__WXMSW__) && defined(__WATCOMC__) +/* +#undef wxUSE_GLCANVAS +#define wxUSE_GLCANVAS 0 +*/ + +#undef wxUSE_MS_HTML_HELP +#define wxUSE_MS_HTML_HELP 0 + +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 0 +#endif + #if defined(__WXMSW__) && !defined(__WIN32__) #undef wxUSE_SOCKETS @@ -573,6 +786,9 @@ #undef wxUSE_LIBJPEG #define wxUSE_LIBJPEG 0 +#undef wxUSE_LIBTIFF +#define wxUSE_LIBTIFF 0 + #undef wxUSE_GIF #define wxUSE_GIF 0 @@ -582,7 +798,40 @@ #undef wxUSE_PCX #define wxUSE_PCX 0 +#undef wxUSE_GLCANVAS +#define wxUSE_GLCANVAS 0 + +#undef wxUSE_MS_HTML_HELP +#define wxUSE_MS_HTML_HELP 0 + +#undef wxUSE_WCHAR_T +#define wxUSE_WCHAR_T 0 + +#endif // Win16 + +// ---------------------------------------------------------------------------- +// 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_TIMEDATE && !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_