string conversion implemented for mac

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 57b110ba55d5e5c96a4b2de3f35dd225c3f05575..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
@@ -157,6 +160,15 @@
  */
 #undef HAVE_CONST_CAST
 
+/*
+ * Define if your compiler has std::wstring
+ */
+#undef HAVE_STD_WSTRING
+/*
+ * Define if your compiler has compilant std::string::compare
+ */
+#undef HAVE_STD_STRING_COMPARE
+
 /*
  * use STL for containers and wxString
  */
@@ -165,6 +177,10 @@
  * Use regex support
  */
 #define wxUSE_REGEX 0
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 0
 /*
  * Use zlib
  */
@@ -185,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
 /*
@@ -425,6 +442,7 @@
  * Use this control
  */
 #define wxUSE_NOTEBOOK 0
+#define wxUSE_LISTBOOK 0
 /*
  * Use this control
  */
@@ -504,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
  */
@@ -565,6 +572,8 @@
  */
 #define wxUSE_TEXTFILE 0
 
+#define wxUSE_EXCEPTIONS 0
+
 /*
  * Use log classes and logging functions
  */
@@ -664,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
 
@@ -673,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
  */
@@ -764,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
@@ -773,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
  */
@@ -857,6 +877,11 @@
  */
 #define wxUSE_ZIPSTREAM 0
 
+/*
+ * Use gzip streams, requires wxUSE_ZLIB
+ */
+#define wxUSE_GZSTREAM 0
+
 /*
  * wxPalette class
  */
@@ -1091,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
 
@@ -1136,6 +1164,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