add missing header to allow ../src/common/docview.cpp to compile

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

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index b9f93e8f0b2d69b386f1b73399ea42afe0103b24..a397c63ecf23c157877208deab061492c60b5847 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -26,15 +26,15 @@
 // compatibility settings
 // ----------------------------------------------------------------------------
 
 // compatibility settings
 // ----------------------------------------------------------------------------
 

-// This setting determines the compatibility with 2.0 API: set it to 1 to
+// This setting determines the compatibility with 2.4 API: set it to 1 to

 // enable it
 //
 // Default is 0.
 //
 // Recommended setting: 0 (please update your code instead!)
 // enable it
 //
 // Default is 0.
 //
 // Recommended setting: 0 (please update your code instead!)

-#define WXWIN_COMPATIBILITY_2_2 0
+#define WXWIN_COMPATIBILITY_2_4 0

 
 

-// This setting determines the compatibility with 2.2 API: set it to 0 to
+// This setting determines the compatibility with 2.6 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
 // flag all cases of using deprecated functions.
 //
 // Default is 1 but please try building your code with 0 as the default will


@@ -42,7 +42,7 @@
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)
 // in the version after it completely.
 //
 // Recommended setting: 0 (please update your code)

-#define WXWIN_COMPATIBILITY_2_4 1
+#define WXWIN_COMPATIBILITY_2_6 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.
 
 // 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.


@@ -171,7 +171,7 @@
 // Default is 1
 //
 // Recommended setting: 1 for win32 else 0
 // Default is 1
 //
 // Recommended setting: 1 for win32 else 0

-#if defined(__WIN32__)
+#if defined(__WIN32__) || defined(__WATCOMC__)

     #define wxUSE_WCHAR_T 1
 #else
     #define wxUSE_WCHAR_T 0
     #define wxUSE_WCHAR_T 1
 #else
     #define wxUSE_WCHAR_T 0


@@ -649,6 +649,14 @@
 // Recommended setting: 1
 #define wxUSE_CHOICEBOOK 1
 
 // Recommended setting: 1
 #define wxUSE_CHOICEBOOK 1
 

+// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
+// the tabs
+//
+// Default is 1.
+//
+// Recommended setting: 1
+#define wxUSE_TREEBOOK 1
+

 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //
 // wxTabDialog is a generic version of wxNotebook but it is incompatible with
 // the new class. It shouldn't be used in new code.
 //