string conversion implemented for mac

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 42698ef53b451ef2f7fbbe040976c8b440da89ea..a1bddc63d9ac4124320c8207c8108a0d5b7ea2e5 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
 /*
@@ -568,6 +572,8 @@
  */
 #define wxUSE_TEXTFILE 0
 
+#define wxUSE_EXCEPTIONS 0
+
 /*
  * Use log classes and logging functions
  */
@@ -667,7 +673,7 @@
 #define wxUSE_WCHAR_T 0
 
 /*
- * Compile wxWindows in Unicode mode (Win32 only for now)?
+ * Compile wxWindows in Unicode mode?
  */
 #define wxUSE_UNICODE 0
 
@@ -778,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
@@ -867,6 +877,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 0
+
 /*
  * wxPalette class
  */
@@ -1101,6 +1116,9 @@
 /* Define if you have the <X11/XKBlib.h> header file.  */
 #undef HAVE_X11_XKBLIB_H
 
+/* Define if you have the <X11/extensions/xf86vmode.h> header file.  */
+#undef HAVE_X11_EXTENSIONS_XF86VMODE_H
+
 /* Define if you have the fnmatch() function */
 #undef HAVE_FNMATCH
 
@@ -1149,6 +1167,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