new carbon implementation (unicode support)

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 3a3c6e9cab64fbe48b2b2b0664601ceb0c1e5552..ab3aea63ce1f4d7a37927ef4126e94d8acfc1dea 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -198,6 +198,7 @@
  * Use iODBC
  */
 #define wxUSE_ODBC 0
+#define wxUSE_BUILTIN_IODBC 0
 #define wxODBC_FWD_ONLY_CURSORS 1
 #define wxODBC_BACKWARD_COMPATABILITY 0
 /*
@@ -438,6 +439,7 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
+#define wxUSE_LISTBOOK 0
 /*
  * Use this control
  */
@@ -517,17 +519,6 @@
  */
 #define wxUSE_TOOLBAR_NATIVE 0
 
-/*
- * Use generic wxToolBar instead of/together with the native one?
- */
-#define wxUSE_TOOLBAR_SIMPLE 0
-
-#if defined(__WXWINE__) || defined(__GNUWIN32__) || defined(__WXPM__)
-  #if wxUSE_TOOLBAR
-    #define wxUSE_BUTTONBAR 1
-  #endif
-#endif
-
 /*
  * Use wxTreeLayout class
  */
@@ -797,10 +788,6 @@
  * Use Apple Ieee-double converter
  */
 #define wxUSE_APPLE_IEEE 0
-/*
- * Compatibility with 2.0 API.
- */
-#define WXWIN_COMPATIBILITY_2 0
 /*
  * Compatibility with 2.2 API
  */