Use multi-lib build on MSW, and other tweaks

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index dafa4a070d74595a2fa0d3fe999e0a4c92b89cc7..3a3c6e9cab64fbe48b2b2b0664601ceb0c1e5552 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -70,27 +70,29 @@
 #define wxUSE_UNIX 0
 
 #undef __UNIX__
-#undef __LINUX__
-#undef __SGI__
-#undef __HPUX__
-#undef __SYSV__
-#undef __SVR4__
+
 #undef __AIX__
-#undef __SUN__
-#undef __SOLARIS__
-#undef __SUNOS__
-#undef __ALPHA__
-#undef __IA64__
-#undef __OSF__
 #undef __BSD__
-#undef __FREEBSD__
 #undef __DARWIN__
+#undef __EMX__
+#undef __FREEBSD__
+#undef __HPUX__
+#undef __LINUX__
 #undef __NETBSD__
 #undef __OPENBSD__
-#undef __VMS__
+#undef __OSF__
+#undef __SGI__
+#undef __SOLARIS__
+#undef __SUN__
+#undef __SUNOS__
+#undef __SVR4__
+#undef __SYSV__
 #undef __ULTRIX__
-#undef __DATA_GENERAL__
-#undef __EMX__
+#undef __UNIXWARE__
+#undef __VMS__
+
+#undef __IA64__
+#undef __ALPHA__
 
 /* NanoX (with wxX11) */
 #define wxUSE_NANOX 0
@@ -134,7 +136,7 @@
 #endif
 
 /* enable rich edit under Win32 */
-#if defined(__WIN95__) && !defined(__TWIN32__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #else
 #define wxUSE_RICHEDIT 0
@@ -155,10 +157,27 @@
  */
 #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
+ */
+#define wxUSE_STL 0
 /*
  * Use regex support
  */
 #define wxUSE_REGEX 0
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 0
 /*
  * Use zlib
  */
@@ -206,7 +225,9 @@
 /*
  * Use GUI
  */
+#ifndef wxUSE_GUI
 #define wxUSE_GUI 0
+#endif
 /*
  * Don't use GUI (defined to 1 when compiling/using base only)
  */
@@ -327,6 +348,11 @@
  */
 #define wxUSE_DRAGIMAGE 0
 
+/*
+ * Enable accessibility support
+ */
+#define wxUSE_ACCESSIBILITY 0
+
 /*
  * Use property sheet classes
  */
@@ -660,6 +686,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
  */
@@ -1123,6 +1160,9 @@
 /* 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 wcsrtombs() function */
 #undef HAVE_WCSRTOMBS