X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c06469f66f5293111453161ad2e0cae12363f98b..d19ebfaa43dcb4e2542ed41de2fc73d88b7c2be6:/setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 98bba98270..49e7b3ddc1 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -203,7 +203,12 @@
 
 #define wxUSE_STD_IOSTREAM  0
 
-#define wxUSE_STD_STRING  0
+#if defined(__DMC__) || defined(__WATCOMC__) \
+        || (defined(_MSC_VER) && _MSC_VER < 1200)
+    #define wxUSE_STD_STRING  0
+#else
+    #define wxUSE_STD_STRING  0
+#endif
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
@@ -245,12 +250,16 @@
 
 #define wxUSE_FS_ZIP        0
 
+#define wxUSE_FS_ARCHIVE    0
+
 #define wxUSE_FS_INET       0
 
 #define wxUSE_ARCHIVE_STREAMS     0
 
 #define wxUSE_ZIPSTREAM     0
 
+#define wxUSE_TARSTREAM     0
+
 #define wxUSE_ZLIB          0
 
 #define wxUSE_APPLE_IEEE          0
@@ -285,11 +294,7 @@
 
 #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
 
@@ -312,6 +317,7 @@
 #define wxUSE_CHECKBOX      0
 #define wxUSE_CHECKLISTBOX  0
 #define wxUSE_CHOICE        0
+#define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_DATAVIEWCTRL  0
@@ -375,8 +381,6 @@
 
 #define wxUSE_DISPLAY       0
 
-#define wxUSE_DETECT_SM     0
-
 #define wxUSE_GEOMETRY            0
 
 #define wxUSE_IMAGLIST      0
@@ -507,6 +511,8 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_TGA           0
+
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
@@ -754,6 +760,12 @@
  */
 #define CONST_COMPATIBILITY 0
 
+/*
+ * use the session manager to detect KDE/GNOME
+ */
+#define wxUSE_DETECT_SM     0
+
+
 /* define with the name of timezone variable */
 #undef WX_TIMEZONE
 
@@ -862,6 +874,9 @@
 /* Define if strptime() is declared in headers */
 #undef HAVE_STRPTIME_DECL
 
+/* Define if you have strtoull() and strtoll() */
+#undef HAVE_STRTOULL
+
 /* Define if you have all functions to set thread priority */
 #undef HAVE_THREAD_PRIORITY_FUNCTIONS
 
@@ -884,6 +899,9 @@
 /* Define if you have wcslen function  */
 #undef HAVE_WCSLEN
 
+/* Define if you have wcstoull() and wcstoll() */
+#undef HAVE_WCSTOULL
+
 /* define if you have vsscanf function */
 #undef HAVE_VSSCANF
 
@@ -1040,6 +1058,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
 
@@ -1140,9 +1161,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