X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e88f6524513de78a0f8434e188ae0e7c354dba05..412b97cc9a807ebcecefb403c949597a9f3d2199:/include/wx/os2/setup0.h diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h index d03b6e30dc..8d0e95131a 100644 --- a/include/wx/os2/setup0.h +++ b/include/wx/os2/setup0.h @@ -27,15 +27,17 @@ // compatibility settings // ---------------------------------------------------------------------------- -// This setting determines the compatibility with 2.4 API: set it to 1 to -// enable it but please consider updating your code instead. +// This setting determines the compatibility with 2.6 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 (please update your code) -#define WXWIN_COMPATIBILITY_2_4 0 +#define WXWIN_COMPATIBILITY_2_6 0 -// This setting determines the compatibility with 2.6 API: set it to 0 to +// This setting determines the compatibility with 2.8 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 @@ -43,7 +45,7 @@ // in the version after it completely. // // Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_6 1 +#define WXWIN_COMPATIBILITY_2_8 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 @@ -272,7 +274,21 @@ #define wxUSE_STD_IOSTREAM 0 // Enable conversion to standard C++ string if 1. -#define wxUSE_STD_STRING 0 +// +// 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 @@ -426,6 +442,9 @@ // 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 + // Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) #define wxUSE_FS_INET 1 @@ -435,6 +454,9 @@ // 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 @@ -512,7 +534,7 @@ // // Default is 1. // -// Recommended setting: 1 +// Recommended setting: 1 #define wxUSE_MEDIACTRL 1 // Use GStreamer for Unix (req a lot of dependancies) @@ -532,14 +554,10 @@ // 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 +// Default is the same as wxUSE_XRC, i.e. 1 by default. // // Recommended setting: 1 (required by XRC) -#if wxUSE_XRC -# define wxUSE_XML 1 -#else -# define wxUSE_XML 0 -#endif +#define wxUSE_XML wxUSE_XRC // Use wxWidget's AUI docking system // @@ -600,12 +618,14 @@ // Default is 1 // // Recommended setting: 1 +#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 (requires wxUSE_OWNER_DRAWN) #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 @@ -620,6 +640,7 @@ #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 @@ -901,6 +922,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 // ---------------------------------------------------------------------------- @@ -1030,6 +1059,16 @@ #define wxUSE_HELP 1 // 0 for no help facility +// Should we use MS HTML help for wxHelpController? If disabled, neither +// wxCHMHelpController nor wxBestHelpController are available. +// +// Default is 1 under MSW, 0 is always used for the other platforms. +// +// Recommended setting: 1, only set to 0 if you have trouble compiling +// wxCHMHelpController (could be a problem with really ancient compilers) +#define wxUSE_MS_HTML_HELP 1 + + // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 @@ -1123,6 +1162,9 @@ // Set to 1 for TIFF format support (requires libtiff) #define wxUSE_LIBTIFF 1 +// Set to 1 for TGA format support (loading only) +#define wxUSE_TGA 1 + // Set to 1 for GIF format support #define wxUSE_GIF 1