X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03aa88aba79b7df581bab46597668ab0b5eb4729..a4535b9f391bbe8453f70784bc77a06f3426e858:/include/wx/univ/setup0.h diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 5925084bd0..2a69ec8bb3 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -26,33 +26,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 -// enable it -// -// Default is 0. -// -// Recommended setting: 0 (please update your code instead!) -#define WXWIN_COMPATIBILITY_2_2 0 - -// This setting determines the compatibility with 2.2 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 @@ -60,15 +34,17 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_4 1 +#define WXWIN_COMPATIBILITY_2_6 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. +// This setting determines the compatibility with 2.8 API: set it to 0 to +// flag all cases of using deprecated functions. // -// Default is 0 +// 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. // -// Recommended setting: 0 -#define wxFONT_SIZE_COMPATIBILITY 0 +// Recommended setting: 0 (please update your code) +#define WXWIN_COMPATIBILITY_2_8 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. @@ -85,7 +61,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. // @@ -158,7 +134,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. // @@ -166,12 +142,14 @@ // doesn't support it and the programs compiled in Unicode mode will not run // under 9x). // -// Default is 0 +// Default is 1 // -// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) -#define wxUSE_UNICODE 0 +// Recommended setting: 1 +#ifndef wxUSE_UNICODE + #define wxUSE_UNICODE 1 +#endif -// 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 @@ -195,7 +173,7 @@ // Default is 1 // // Recommended setting: 1 for win32 else 0 -#if defined(__WIN32__) +#if defined(__WIN32__) || defined(__WATCOMC__) #define wxUSE_WCHAR_T 1 #else #define wxUSE_WCHAR_T 0 @@ -205,6 +183,35 @@ // global features // ---------------------------------------------------------------------------- +// Compile library in exception-safe mode? If set to 1, the library will try to +// behave correctly in presence of exceptions (even though it still will not +// use the exceptions itself) and notify the user code about any unhandled +// exceptions. If set to 0, propagation of the exceptions through the library +// code will lead to undefined behaviour -- but the code itself will be +// slightly smaller and faster. +// +// Default is 1 +// +// Recommended setting: depends on whether you intend to use C++ exceptions +// in your own code (1 if you do, 0 if you don't) +#define wxUSE_EXCEPTIONS 1 + +// Set wxUSE_STL to 1 to derive wxList(Foo) and wxArray(Foo) from +// std::list and std::vector, with a compatibility interface, +// and for wxHashMap to be implemented with templates. +// +// Default is 0 +// +// Recommended setting: YMMV +#define wxUSE_STL 0 + +// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI +// +// Default is 0 +// +// Recommended setting: 0 +#define wxUSE_EXTENDED_RTTI 0 + // 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. @@ -243,7 +250,7 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// 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. @@ -253,6 +260,38 @@ #define wxUSE_STD_IOSTREAM 0 #endif +// Enable conversion to standard C++ string if 1. +// +// Default is 1 for most compilers. +// +// Currently the Digital Mars and Watcom compilers come without standard C++ +// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have +// them (e.g. from STLPort). +// +// VC++ 5.0 does include standard C++ library header, however they produce +// many warnings that can't be turned off when compiled at warning level 4. +#if defined(__DMC__) || defined(__WATCOMC__) \ + || (defined(_MSC_VER) && _MSC_VER < 1200) + #define wxUSE_STD_STRING 0 +#else + #define wxUSE_STD_STRING 1 +#endif + +// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. +// Note that if the system's implementation does not support positional +// parameters, setting this to 1 forces the use of the wxWidgets implementation +// of wxVsnprintf. The standard vsnprintf() supports positional parameters on +// many Unix systems but usually doesn't under Windows. +// +// Positional parameters are very useful when translating a program since using +// them in formatting strings allow translators to correctly reorder the +// translated sentences. +// +// Default is 1 +// +// Recommended setting: 1 if you want to support multiple languages +#define wxUSE_PRINTF_POS_PARAMS 0 + // ---------------------------------------------------------------------------- // non GUI features selection // ---------------------------------------------------------------------------- @@ -287,6 +326,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 @@ -314,15 +361,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 @@ -407,19 +445,28 @@ // Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) #define wxUSE_FS_ZIP 1 +// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) +#define wxUSE_FS_ARCHIVE 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 +// Set to 1 to compile wxTarInput/OutputStream classes. +#define wxUSE_TARSTREAM 1 + // Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG. -#define wxUSE_ZLIB 1 +// wxUSE_LIBPNG +#define wxUSE_ZLIB 1 // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) #define wxUSE_FS_INET 1 // 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. // @@ -455,6 +502,15 @@ // Define this to use wxURL class. #define wxUSE_URL 1 +// Support for wxVariant class used in several places throughout the library, +// notably in wxDataViewCtrl API. +// +// Default is 1. +// +// Recommended setting: 1 unless you want to reduce the library size as much as +// possible in which case setting this to 0 can gain up to 100KB. +#define wxUSE_VARIANT 1 + // Support for regular expression matching via wxRegEx class: enable this to // use POSIX regular expressions in your code. You need to compile regex // library from src/regex to use it under Windows. @@ -468,8 +524,66 @@ // wxSystemOptions class #define wxUSE_SYSTEM_OPTIONS 1 -// wxWave class -#define wxUSE_WAVE 1 +// wxSound class +#define wxUSE_SOUND 1 + +// Use wxMediaCtrl +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_MEDIACTRL 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 + +// Use wxWidget's AUI docking system +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_AUI 1 + +// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_STC 1 + + +// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced +// 2D drawing API. (Still somewhat experimental) +// +// Please note that on Windows you will need to link with gdiplus.lib (use +// USE_GDIPLUS=1 for makefile builds) and distribute gdiplus.dll with your +// application if you want it to be runnable on pre-XP systems. +// +// Default is 0 +// +// Recommended setting: 1 +#ifndef wxUSE_GRAPHICS_CONTEXT +#define wxUSE_GRAPHICS_CONTEXT 0 +#endif + +// Set to 1 to compile MS Windows XP theme engine support +#define wxUSE_UXTHEME 0 // ---------------------------------------------------------------------------- // Individual GUI controls @@ -499,7 +613,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 @@ -508,29 +622,39 @@ // Default is 1 // // Recommended setting: 1 -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TOGGLEBTN 0 // requires wxButton // currently not supported -#define wxUSE_TREECTRL 1 // wxTreeCtrl +#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl +#define wxUSE_BUTTON 1 // wxButton +#define wxUSE_BMPBUTTON 1 // wxBitmapButton +#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl +#define wxUSE_CHECKBOX 1 // wxCheckBox +#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox +#define wxUSE_CHOICE 1 // wxChoice +#define wxUSE_COLLPANE 1 // wxCollapsiblePane +#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl +#define wxUSE_COMBOBOX 1 // wxComboBox +#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl +#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl +#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl +#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl +#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl +#define wxUSE_GAUGE 1 // wxGauge +#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl +#define wxUSE_LISTBOX 1 // wxListBox +#define wxUSE_LISTCTRL 1 // wxListCtrl +#define wxUSE_RADIOBOX 1 // wxRadioBox +#define wxUSE_RADIOBTN 1 // wxRadioButton +#define wxUSE_SCROLLBAR 1 // wxScrollBar +#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl +#define wxUSE_SLIDER 1 // wxSlider +#define wxUSE_SPINBTN 1 // wxSpinButton +#define wxUSE_SPINCTRL 1 // wxSpinCtrl +#define wxUSE_STATBOX 1 // wxStaticBox +#define wxUSE_STATLINE 1 // wxStaticLine +#define wxUSE_STATTEXT 1 // wxStaticText +#define wxUSE_STATBMP 1 // wxStaticBitmap +#define wxUSE_TEXTCTRL 1 // wxTextCtrl +#define wxUSE_TOGGLEBTN 1 // wxToggleButton +#define wxUSE_TREECTRL 1 // wxTreeCtrl // Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR // below either wxStatusBar95 or a generic wxStatusBar will be used. @@ -551,20 +675,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 0 for all settings. // -// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE and -// wxUSE_TOOLBAR_SIMPLE. +// Recommended setting: 1 for wxUSE_TOOLBAR and 0 for wxUSE_TOOLBAR_NATIVE. #define wxUSE_TOOLBAR 1 #define wxUSE_TOOLBAR_NATIVE 0 -#define wxUSE_TOOLBAR_SIMPLE 1 - -// 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 @@ -576,6 +693,38 @@ // Recommended setting: 1 #define wxUSE_NOTEBOOK 1 +// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of +// the tabs +// +// Default is 1. +// +// Recommended setting: 1 +#define wxUSE_LISTBOOK 1 + +// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of +// the tabs +// +// Default is 1. +// +// 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. // @@ -584,13 +733,39 @@ // Recommended setting: 0 (use wxNotebook) #define wxUSE_TAB_DIALOG 0 -// wxGrid class. +// wxGrid class +// +// Default is 1, set to 0 to cut down compilation time and binaries size if you +// don't use it. +// +// Recommended setting: 1 // -// Default is 1. #define wxUSE_GRID 1 -// wxProperty[Value/Form/List] classes, used by Dialog Editor -#define wxUSE_PROPSHEET 1 +// wxComboCtrl and related classes: combobox with custom popup window and +// not necessarily a listbox. +// +// Default is 1. +// +// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it +// it used by wxComboBox +#define wxUSE_COMBOCTRL 1 + +// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox +// items. +// +// Default is 1. +// +// Recommended setting: 1 but can be safely set to 0, except where it is +// needed as a base class for generic wxBitmapComboBox. +#define wxUSE_ODCOMBOBOX 1 + +// wxBitmapComboBox a combobox that can have images in front of text items. +// +// Default is 1. +// +// Recommended setting: 1 but can be safely set to 0 +#define wxUSE_BITMAPCOMBOBOX 1 // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff @@ -665,23 +840,10 @@ // wxDC cacheing implementation #define wxUSE_DC_CACHEING 1 -// Set this to 1 to enable the use of DIB's for wxBitmap to support -// bitmaps > 16MB on Win95/98/Me. Set to 0 to use DDB's only. -#define wxUSE_DIB_FOR_BITMAP 0 - // ---------------------------------------------------------------------------- // 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. @@ -764,6 +926,14 @@ // wizards #define wxUSE_WIZARDDLG 1 +// Compile in wxAboutBox() function showing the standard "About" dialog. +// +// Default is 1 +// +// Recommended setting: 1 but can be set to 0 to save some space if you don't +// use this function +#define wxUSE_ABOUTDLG 1 + // ---------------------------------------------------------------------------- // Metafiles support // ---------------------------------------------------------------------------- @@ -795,16 +965,25 @@ // Big GUI components // ---------------------------------------------------------------------------- +// Set to 0 to disable MDI support. +// +// Requires wxUSE_NOTEBOOK under platforms other than MSW. +// +// Default is 1. +// +// Recommended setting: 1, can be safely set to 0. +#define wxUSE_MDI 1 + // Set to 0 to disable document/view architecture #define wxUSE_DOC_VIEW_ARCHITECTURE 1 // Set to 0 to disable MDI document/view architecture +// +// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE #define wxUSE_MDI_ARCHITECTURE 1 // Set to 0 to disable print/preview architecture code -// -// (doesn't compile anyhow right now (Aug 2003)) -#define wxUSE_PRINTING_ARCHITECTURE 0 +#define wxUSE_PRINTING_ARCHITECTURE 1 // wxHTML sublibrary allows to display HTML in wxWindow programs and much, // much more. @@ -830,8 +1009,13 @@ #define wxUSE_GLCANVAS 0 #endif -// wxTreeLayout class -#define wxUSE_TREELAYOUT 1 +// 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 @@ -909,37 +1093,12 @@ // Use wxHTML-based help controller #define wxUSE_WXHTML_HELP 1 -// Use resources -#define wxUSE_RESOURCES 1 - // Window layout constraint system #define wxUSE_CONSTRAINTS 1 // Splines #define wxUSE_SPLINES 1 -// Use XPM support in wxBitmap -// -// Default is 1, as XPM is now fully supported this makes easier the issue -// of portable icons and bitmaps -#if defined(__WIN32__) - #define wxUSE_XPM_IN_MSW 1 -#else - #define wxUSE_XPM_IN_MSW 0 -#endif - -// Use dynamic DIB loading/saving code in utils/dib under MSW. -#define wxUSE_IMAGE_LOADING_IN_MSW 0 - -// Use dynamic icon/cursor loading/saving code under MSW. -#define wxUSE_RESOURCE_LOADING_IN_MSW 0 - -// use wxExpr (a.k.a. PrologIO) -#define wxUSE_PROLOGIO 0 - -// Use .wxr resource mechanism (requires PrologIO library) -#define wxUSE_WX_RESOURCES 0 - // Include mouse wheel support #define wxUSE_MOUSEWHEEL 1 @@ -953,14 +1112,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). -#if defined(__WIN32__) - #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 -#else - #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 -#endif - // ---------------------------------------------------------------------------- // database classes // ---------------------------------------------------------------------------- @@ -978,7 +1129,7 @@ #define wxODBC_FWD_ONLY_CURSORS 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 +// 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. @@ -1058,7 +1209,7 @@ // ---------------------------------------------------------------------------- #if defined(__WINDOWS__) -// 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. @@ -1073,29 +1224,16 @@ // Default is 1. // // Recommended setting: 1 for WIN32 -#if defined(__WIN32__) #define wxUSE_OLE 1 + +// Set to 0 to disable PostScript print/preview architecture code under Windows +// (just use Windows printing). +#if defined(__WIN32__) + #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 #else - #define wxUSE_OLE 0 + #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 0 #endif -// Set this to 1 to use Microsoft CTL3D library for "3D-look" under Win16 or NT -// 3.x. This setting is ignored under Win9x and NT 4.0+. -// -// Default is 0 for (most) Win32 (systems), 1 for Win16 -// -// Recommended setting: 0 -#define wxUSE_CTL3D 0 - -// 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: 0 -#define wxUSE_ITSY_BITSY 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 // doesn't have such limitation). @@ -1122,175 +1260,20 @@ // Recommended setting: 1, set to 0 for a small library size reduction #define wxUSE_OWNER_DRAWN 0 -#endif - -// ---------------------------------------------------------------------------- -// disable the settings which don't work for some compilers -// ---------------------------------------------------------------------------- - -#ifndef wxUSE_NORLANDER_HEADERS - #if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) - #define wxUSE_NORLANDER_HEADERS 1 - #else - #define wxUSE_NORLANDER_HEADERS 0 - #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 - #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 - -// Cygwin betas don't have wcslen - #if defined(__CYGWIN__) || defined(__CYGWIN32__) - #if ! ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) - #undef wxUSE_WCHAR_T - #define wxUSE_WCHAR_T 0 - #endif - #endif - -#endif // __GNUWIN32__ - -// 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 - -#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 -// GnuWin32 doesn't have appropriate headers for e.g. IUnknown. - #undef wxUSE_DRAG_AND_DROP - #define wxUSE_DRAG_AND_DROP 0 -#endif - -// Only WIN32 supports wxStatusBar95 -#if !defined(__WIN32__) && wxUSE_NATIVE_STATUSBAR - #undef wxUSE_NATIVE_STATUSBAR - #define wxUSE_NATIVE_STATUSBAR 0 -#endif - -// Salford C++ doesn't like some of the memory operator definitions -#ifdef __SALFORDC__ - #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_THREADS - #define wxUSE_THREADS 0 - - #undef wxUSE_OWNER_DRAWN - #define wxUSE_OWNER_DRAWN 0 -#endif // __SALFORDC__ - -// BC++/Win16 can't cope with the amount of data in resource.cpp -#if defined(__WIN16__) && defined(__BORLANDC__) - #undef wxUSE_WX_RESOURCES - #define wxUSE_WX_RESOURCES 0 - - #undef wxUSE_ODBC - #define wxUSE_ODBC 0 - - #undef wxUSE_NEW_GRID - #define wxUSE_NEW_GRID 0 -#endif - -#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500) -// BC++ 4.0 can't compile JPEG library - #undef wxUSE_LIBJPEG - #define wxUSE_LIBJPEG 0 -#endif - -// wxUSE_DEBUG_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 - */ +// 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 (VC++ and recent BC++ only). +// +// Recommended setting: 1, set to 0 if your programs never crash +#define wxUSE_CRASHREPORT 1 - #undef wxUSE_WCHAR_T - #define wxUSE_WCHAR_T 0 #endif -#if defined(__WXMSW__) && !defined(__WIN32__) - #undef wxUSE_SOCKETS - #define wxUSE_SOCKETS 0 - - #undef wxUSE_THREADS - #define wxUSE_THREADS 0 - - #undef wxUSE_TOOLTIPS - #define wxUSE_TOOLTIPS 0 - - #undef wxUSE_SPINCTRL - #define wxUSE_SPINCTRL 0 - - #undef wxUSE_SPINBTN - #define wxUSE_SPINBTN 0 - - #undef wxUSE_LIBPNG - #define wxUSE_LIBPNG 0 - - #undef wxUSE_LIBJPEG - #define wxUSE_LIBJPEG 0 - - #undef wxUSE_LIBTIFF - #define wxUSE_LIBTIFF 0 - - #undef wxUSE_GIF - #define wxUSE_GIF 0 - - #undef wxUSE_PNM - #define wxUSE_PNM 0 - - #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 - // ---------------------------------------------------------------------------- // unknown settings // ---------------------------------------------------------------------------- -// If 1, enables provision of run-time type information. -// NOW MANDATORY: don't change. -#define wxUSE_DYNAMIC_CLASSES 1 - //?????? #if defined(__WIN32__) #define wxUSE_DDE_FOR_IPC 0 @@ -1298,7 +1281,4 @@ #define wxUSE_DDE_FOR_IPC 0 #endif -//?????? -#define wxUSE_SPAWNBROWSER 0 - #endif // _WX_UNIV_SETUP_H_