Gobs of changes needed to get up to date with today's CVS

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 5e9fb1159b2931d154d000c1af08864539e61dc4..3fd5256d51d9d7ca651af2d534b3f2444aa859ea 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -253,8 +253,6 @@
 
 #define wxUSE_ZIPSTREAM     0
 
-#define wxUSE_BACKINGFILE   0
-
 #define wxUSE_TARSTREAM     0
 
 #define wxUSE_ZLIB          0
@@ -318,6 +316,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
@@ -511,6 +510,8 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_TGA           0
+
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
@@ -872,6 +873,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
 
@@ -894,6 +898,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