X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88783bc499403318cd0e55bbffd9edf760b0394f..1ebd017e14fe820f790487702bf493fb0e772429:/include/wx/mac/setup0.h?ds=sidebyside diff --git a/include/wx/mac/setup0.h b/include/wx/mac/setup0.h index c385c7ebbd..d0d22ba802 100644 --- a/include/wx/mac/setup0.h +++ b/include/wx/mac/setup0.h @@ -14,7 +14,6 @@ /* --- start common options --- */ - // ---------------------------------------------------------------------------- // global settings // ---------------------------------------------------------------------------- @@ -29,15 +28,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 @@ -45,7 +44,7 @@ // 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 // 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 @@ -139,8 +138,9 @@ // // Default is 1 if supported by the compiler. // -// Recommended setting: 0, it is still experimental and API may change -#define wxUSE_DEBUGREPORT 0 +// 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 @@ -161,22 +161,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 @@ -263,12 +247,49 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// If enabled (1), compiles wxWidgets streams classes +// If enabled, compiles wxWidgets streams classes +// +// wx stream classes are used for image IO, process IO redirection, network +// protocols implementation and much more and so disabling this results in a +// lot of other functionality being lost. +// +// Default is 1 +// +// Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 -// Use standard C++ streams if 1. If 0, use wxWin streams implementation. +// Use standard C++ streams if 1 instead of wx streams in some places. If +// disabled (default), wx streams are used everywhere and wxWidgets doesn't +// depend on the standard streams library. +// +// Notice that enabling this does not replace wx streams with std streams +// everywhere, in a lot of places wx streams are used no matter what. +// +// Default is 0 +// +// Recommended setting: 1 if you use the standard streams anyhow and so +// dependency on the standard streams library is not a +// problem #define wxUSE_STD_IOSTREAM 0 +// Enable conversion to standard C++ string if 1. +#define wxUSE_STD_STRING 0 + +// 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 // ---------------------------------------------------------------------------- @@ -486,20 +507,6 @@ // 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 (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 - // Use GStreamer for Unix (req a lot of dependancies) // // Default is 0 @@ -563,30 +570,36 @@ // 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 (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#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 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl +#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 (requires wxUSE_OWNER_DRAWN) +#define wxUSE_CHOICE 1 // wxChoice +#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_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 // requires wxButton +#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. @@ -641,6 +654,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. // @@ -665,6 +694,23 @@ // Recommended setting: 1 (it doesn't cost almost anything) #define wxUSE_MINIFRAME 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 +#define wxUSE_ODCOMBOBOX 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- @@ -684,12 +730,13 @@ #define wxUSE_CARET 1 // Use wxDisplay class: it allows enumerating all displays on a system and -// working with them. +// their geometries as well as finding the display on which the given point or +// window lies. // -// Default is 0 because it isn't yet implemented on all platforms +// Default is 1. // // 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 @@ -881,6 +928,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 // ---------------------------------------------------------------------------- @@ -980,7 +1035,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. @@ -1062,15 +1117,14 @@ // override some settings for Metrowerks // // VZ: isn't this file only used when building with Metrowerks anyhow? +// CS: no, it is also used by the XCode projects #ifdef __MWERKS__ #undef wxUSE_DEBUG_CONTEXT #define wxUSE_DEBUG_CONTEXT 1 #undef wxUSE_STD_IOSTREAM - #define wxUSE_STD_IOSTREAM 1 - - #undef wxUSE_STACKWALKER - #define wxUSE_STACKWALKER 0 + // CS: I have to set this to 0 now, as shared builds are having problems + #define wxUSE_STD_IOSTREAM 0 #endif // things not implemented under Mac @@ -1083,6 +1137,9 @@ #undef wxUSE_TOGGLEBTN #define wxUSE_TOGGLEBTN 0 +#undef wxUSE_STACKWALKER +#define wxUSE_STACKWALKER 0 + // wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to // embed the Safari browser control // 0 by default because of Jaguar compatibility problems @@ -1092,6 +1149,11 @@ // Set to 0 for no libmspack #define wxUSE_LIBMSPACK 0 +// native toolbar does not support embedding controls yet, please test by setting to 1 +#define wxMAC_USE_NATIVE_TOOLBAR 0 + + + #endif // _WX_SETUP_H_