X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/26e422a9adf74e0744a83f2647de4714f13786d3..edc09871744140f16b2ef6b7abaa2289d7deb260:/include/wx/motif/setup0.h diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 89a3eca851..28674de80b 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/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 @@ -153,11 +155,11 @@ // (Windows 9x doesn't support it and the programs compiled in Unicode mode // will not run under 9x -- but see wxUSE_UNICODE_MSLU below). // -// Default is 0 +// Default is 1 // -// Recommended setting: 0 (unless you only plan to use Windows NT/2000/XP) +// Recommended setting: 1 #ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 0 + #define wxUSE_UNICODE 1 #endif // Setting wxUSE_WCHAR_T to 1 gives you some degree of Unicode support without @@ -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 @@ -438,9 +454,6 @@ // Set to 1 to compile wxZipInput/OutputStream classes. #define wxUSE_ZIPSTREAM 1 -// Set to 1 to compile wxBackingFile and wxBackedInputStream -#define wxUSE_BACKINGFILE 1 - // Set to 1 to compile wxTarInput/OutputStream classes. #define wxUSE_TARSTREAM 1 @@ -521,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) @@ -541,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 // @@ -557,6 +566,13 @@ // 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) @@ -616,6 +632,7 @@ #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 @@ -630,6 +647,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 @@ -1051,7 +1069,7 @@ // Should we use MS HTML help for wxHelpController? If disabled, neither // wxCHMHelpController nor wxBestHelpController are available. // -// Default is 1 +// 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) @@ -1061,8 +1079,6 @@ // Use wxHTML-based help controller? #define wxUSE_WXHTML_HELP 1 -#define wxUSE_RESOURCES 0 - // 0 for no wxGetResource/wxWriteResource #define wxUSE_CONSTRAINTS 1 // 0 for no window layout constraint system @@ -1151,6 +1167,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 @@ -1232,10 +1251,6 @@ // 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 - // Set this to 1 to enable wxDIB #define wxUSE_WXDIB 1