Don't assert when Clear() is called, better to ignore it

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index a006bec104d8703377e79cfa142ed0fc05d70ac3..a2ad505a0794c0ba79fd02b941056bca31e68df0 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
  */
@@ -567,6 +569,8 @@
  */
 #define wxUSE_TEXTFILE 0
 
+#define wxUSE_EXCEPTIONS 0
+
 /*
  * Use log classes and logging functions
  */
@@ -786,10 +790,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
  */
@@ -1152,6 +1152,9 @@
 /* Define if you have the <esd.h> header file.  */
 #undef HAVE_ESD_H
 
+/* Define if you have a CD-ROM interface known to mmedia.  */
+#undef HAVE_KNOWN_CDROM_INTERFACE
+
 /* Define if you have wcsrtombs() function */
 #undef HAVE_WCSRTOMBS