Rework wxMotif font/color inheritance so it works

[wxWidgets.git] / include / wx / univ / setup0.h

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 6cce0426f29c3d2c7bf75e0e9c04475316d2f648..83843b71e3d9a31d558c59b5034f2aafe96b9877 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -26,15 +26,17 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
-// This setting determines the compatibility with 2.4 API: set it to 1 to
-// enable it
+// 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 instead!)
-#define WXWIN_COMPATIBILITY_2_4 0
+// Recommended setting: 0 (please update your code)
+#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
@@ -42,7 +44,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
 
 // 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.
@@ -258,6 +260,23 @@
     #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
@@ -444,9 +463,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
 
@@ -633,20 +649,22 @@
 #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_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_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
@@ -845,10 +863,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
-
 // ----------------------------------------------------------------------------
 // common dialogs
 // ----------------------------------------------------------------------------