addedd support for <pre width=...>

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 208d0b27c0bae862fe2bcba7197ce3694433f1e2..2b70d2484bc395f1882c722af1744691f8b8dcda 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -125,6 +125,9 @@
 #undef WINVER
 #endif
 
+/* OS/2 with EMX */
+#undef __OS2__
+
 /* enable native status bar under Win32 */
 #if defined(__WIN95__) && !defined(__WXUNIVERSAL__)
 #define wxUSE_NATIVE_STATUSBAR 1
@@ -198,6 +201,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 +442,7 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
+#define wxUSE_LISTBOOK 0
 /*
  * Use this control
  */
@@ -517,17 +522,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
  */
@@ -578,6 +572,8 @@
  */
 #define wxUSE_TEXTFILE 0
 
+#define wxUSE_EXCEPTIONS 0
+
 /*
  * Use log classes and logging functions
  */
@@ -686,6 +682,17 @@
  */
 #define wxUSE_UNICODE_MSLU 0
 
+/*
+ * Set to 1 to compile MS Windows XP theme engine support
+ */
+#define wxUSE_UXTHEME 1
+
+/*
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)
+ */
+#define wxUSE_UXTHEME_AUTO 1
+
 /*
  * Use wxURL class
  */
@@ -777,6 +784,10 @@
  * Use MS HTML Help controller (win32)
  */
 #define wxUSE_MS_HTML_HELP 0
+/*
+ * Use MS HTML Help via libmspack (Unix)
+ */
+#define wxUSE_LIBMSPACK 0
 
 /*
  * Use iostream.h rather than iostream
@@ -786,10 +797,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
  */
@@ -870,6 +877,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 0
+
 /*
  * wxPalette class
  */
@@ -1149,6 +1161,12 @@
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
+/* 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