Changed month

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 9819817a864ffe089f38a95c2bd2bd2ed5982609..49e7b3ddc17d83b8038887f052f138ab7e6d3d53 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -294,11 +294,7 @@
 
 #define wxUSE_XRC       0
 
 
 #define wxUSE_XRC       0
 

-#if wxUSE_XRC
-#define wxUSE_XML       0
-#else
-#  define wxUSE_XML       0
-#endif
+#define wxUSE_XML       wxUSE_XRC

 
 #define wxUSE_AUI       0
 
 
 #define wxUSE_AUI       0
 


@@ -1062,6 +1058,9 @@
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 
 /* Define if you have the <wctype.h> header file.  */
 #undef HAVE_WCTYPE_H
 

+/* Define if you have <widec.h> (Solaris only) */
+#undef HAVE_WIDEC_H
+

 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #undef HAVE_ICONV
 
 /* Define if you have the <iconv.h> header file and iconv() symbol.  */
 #undef HAVE_ICONV
 


@@ -1162,9 +1161,9 @@
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 

-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
+/* When using an external jpeg library and the Windows headers already define
+ * boolean, define to the type used by the jpeg library for boolean.  */
+#undef wxHACK_BOOLEAN

 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H
 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H