Derive wxBitmap from wxBitmapBase in wxMotif, with the appropriate

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index ed4f25881ebec00c45cc11e0f9e66058e366b755..cb69d3bcdc101cc980e2b40ca622c3e68cdebc53 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -47,11 +47,21 @@
 // This setting determines the compatibility with 2.0 API: set it to 1 to
 // enable it
 //
-// Default is 1.
+// Default is 0.
 //
 // Recommended setting: 0 (please update your code instead!)
 #define WXWIN_COMPATIBILITY_2_2 0
 
+// This setting determines the compatibility with 2.2 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
+// 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 1
+
 // in wxMSW version 2.1.11 and earlier, wxIcon always derives from wxBitmap,
 // but this is very dangerous because you can mistakenly pass an icon instead
 // of a bitmap to a function taking "const wxBitmap&" - which will *not* work
@@ -199,7 +209,7 @@
 //
 // Recommended setting: 1 for win32 else 0
 #if defined(__WIN32__)
-    #define wxUSE_WCHAR_T 0 //? unresolved external symbol wxCharsetToCodepage
+    #define wxUSE_WCHAR_T 1
 #else
     #define wxUSE_WCHAR_T 0
 #endif
@@ -519,7 +529,7 @@
 #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_CHECKLISTBOX 1    // wxCheckListBox
 #define wxUSE_CHOICE       1    // wxChoice
 #define wxUSE_COMBOBOX     1    // wxComboBox
 #define wxUSE_GAUGE        1    // wxGauge
@@ -662,8 +672,8 @@
 // Default is 1.
 //
 // Recommended setting: 1
-#if defined(__WIN32__)
-    #define wxUSE_TOOLTIPS 0 //? error 'SetWindow' cannot convert parameter 1 ...
+#ifdef __WIN32__
+    #define wxUSE_TOOLTIPS 1
 #else
     #define wxUSE_TOOLTIPS 0
 #endif
@@ -767,7 +777,7 @@
 #define wxUSE_SPLASH 1
 
 // wizards
-#define wxUSE_WIZARDDLG 0 //? error '_wxArraywxArrayPages' redefinition
+#define wxUSE_WIZARDDLG 1
 
 // ----------------------------------------------------------------------------
 // Metafiles support
@@ -888,7 +898,7 @@
 #define wxUSE_MS_HTML_HELP 1
 
 // Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 0 //? error 'type cast' cannot convert from ...
+#define wxUSE_WXHTML_HELP 1
 
 // Use resources
 #define wxUSE_RESOURCES 1
@@ -1112,13 +1122,12 @@
     #define wxUSE_RICHEDIT2 0
 #endif
 
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
+// Set this to 1 to enable support for the owner-drawn menu and listboxes.
 //
 // Default is 1.
 //
 // Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 0 //? error 'MSWOnDraw' is not a member of 'wxControl'
+#define wxUSE_OWNER_DRAWN 0
 
 #endif
 
@@ -1184,11 +1193,6 @@
     #define wxUSE_NATIVE_STATUSBAR 0
 #endif
 
-#if !wxUSE_OWNER_DRAWN
-    #undef wxUSE_CHECKLISTBOX
-    #define wxUSE_CHECKLISTBOX 0
-#endif
-
 // Salford C++ doesn't like some of the memory operator definitions
 #ifdef __SALFORDC__
     #undef  wxUSE_MEMORY_TRACING