up to 2.8.0

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 78bc597c6bd7120b361c7b099b0e663a01e41f67..6676237b331120b3e8514dfb6f45ae408f3f0b3f 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -332,6 +332,7 @@
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SPINBTN       0
 #define wxUSE_SPINCTRL      0
@@ -1058,6 +1059,9 @@
 /* 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
 
@@ -1158,9 +1162,9 @@
  */
 #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