X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e4ae332ac7d85be3592640ffef56a60924cc1c9..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/setup_inc.h diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 44a5fbb79c..d7fdc23954 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -230,16 +230,6 @@ // Recommended setting: 0 unless you do plan to develop MT applications #define wxUSE_THREADS 1 -// Set wxUSE_WEAKREF to 1 t support use of weak references to common classes -// in wxWidgets (wxWeakRef). Set to 0 if your compiler has problems with -// the template-based implementation (Embedded Visual C++ 4 for ARM has a bug -// in this area, Visual C compiler options "/vmm /vmg" may help then). -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEAKREF 1 - // If enabled, compiles wxWidgets streams classes // // wx stream classes are used for image IO, process IO redirection, network @@ -251,6 +241,22 @@ // Recommended setting: 1 as setting it to 0 disables many other things #define wxUSE_STREAMS 1 +// This is not a real option but is used as the default value for +// wxUSE_STD_IOSTREAM and wxUSE_STD_STRING. +// +// 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 headers, 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_DEFAULT 0 +#else + #define wxUSE_STD_DEFAULT 1 +#endif + // 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. @@ -263,24 +269,15 @@ // 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 +#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT // 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 +// Recommended setting: 1 unless you want to ensure your program doesn't use +// the standard C++ library at all. +#define wxUSE_STD_STRING wxUSE_STD_DEFAULT // Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. // Note that if the system's implementation does not support positional @@ -576,13 +573,6 @@ // Recommended setting: 1 #define wxUSE_MEDIACTRL 1 -// Use GStreamer for Unix (req a lot of dependancies) -// -// Default is 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. // // Default is 1 @@ -605,6 +595,13 @@ // Recommended setting: 1 #define wxUSE_AUI 1 +// Use wxPropertyGrid. +// +// Default is 1 +// +// Recommended setting: 1 +#define wxUSE_PROPGRID 1 + // Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. // // Default is 1 @@ -682,6 +679,7 @@ #define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl #define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl #define wxUSE_GAUGE 1 // wxGauge +#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl #define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl #define wxUSE_LISTBOX 1 // wxListBox #define wxUSE_LISTCTRL 1 // wxListCtrl @@ -769,14 +767,6 @@ // 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. -// -// Default is 0. -// -// Recommended setting: 0 (use wxNotebook) -#define wxUSE_TAB_DIALOG 0 - // wxTaskBarIcon is a small notification icon shown in the system toolbar or // dock. // @@ -826,6 +816,15 @@ // Recommended setting: 1 but can be safely set to 0 #define wxUSE_BITMAPCOMBOBOX 1 +// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items +// up and down in it. It is also used as part of wxRearrangeDialog. +// +// Default is 1. +// +// Recommended setting: 1 but can be safely set to 0 (currently used only by +// wxHeaderCtrl) +#define wxUSE_REARRANGECTRL 1 + // ---------------------------------------------------------------------------- // Miscellaneous GUI stuff // ---------------------------------------------------------------------------- @@ -1067,14 +1066,16 @@ // Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL // headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1. Note that for some compilers (notably Microsoft Visual C++) you -// will need to manually add opengl32.lib and glu32.lib to the list of -// libraries linked with your program if you use OpenGL. +// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the +// list of libraries used to link your application (although this is done +// implicitly for Microsoft Visual C++ users). // -// Default is 0. +// Default is 1 unless the compiler is known to ship without the necessary +// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE). // -// Recommended setting: 1 if you intend to use OpenGL, 0 otherwise -#define wxUSE_GLCANVAS 0 +// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 +// otherwise. +#define wxUSE_GLCANVAS 1 // wxRichTextCtrl allows editing of styled text. // @@ -1173,7 +1174,7 @@ #define wxUSE_AFM_FOR_POSTSCRIPT 1 // Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create fiels in SVG (Scalable Vector Graphics) format. +// to create files in SVG (Scalable Vector Graphics) format. #define wxUSE_SVG 1 // ---------------------------------------------------------------------------- @@ -1189,14 +1190,15 @@ #define REMOVE_UNUSED_ARG 1 // VC++ 4.2 and above allows and but you can't mix -// them. Set to 1 for , 0 for . Note that VC++ 7.1 -// and later doesn't support wxUSE_IOSTREAMH == 1 and so will be -// used anyhow. +// them. Set this option to 1 to use , 0 to use . // -// Default is 1. +// Note that newer compilers (including VC++ 7.1 and later) don't support +// wxUSE_IOSTREAMH == 1 and so will be used anyhow. +// +// Default is 0. // -// Recommended setting: whatever your compiler likes more -#define wxUSE_IOSTREAMH 1 +// Recommended setting: 0, only set to 1 if you use a really old compiler +#define wxUSE_IOSTREAMH 0 // ---------------------------------------------------------------------------- // image format support