use C compiler for tests again, it's useless to use the C++ one for AC_CHECK_FUNCS...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 306348bfd370636b4a59aa5af07b9064785a19cd..78bc597c6bd7120b361c7b099b0e663a01e41f67 100644 (file)
--- 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
@@ -271,6 +280,8 @@
 
 #define wxUSE_URL_NATIVE 0
 
+#define wxUSE_VARIANT 0
+
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0
@@ -283,27 +294,30 @@
 
 #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
 
 
+#ifndef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+
 #define wxUSE_CONTROLS     0
 
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
 
+#define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #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
@@ -356,6 +370,8 @@
 
 #define wxUSE_ODCOMBOBOX 0
 
+#define wxUSE_BITMAPCOMBOBOX 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -411,6 +427,8 @@
 
 #define wxUSE_WIZARDDLG 0
 
+#define wxUSE_ABOUTDLG 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -449,6 +467,7 @@
 
 #define wxUSE_HELP        0
 
+
 #define wxUSE_MS_HTML_HELP 0
 
 
@@ -492,6 +511,8 @@
 
 #define wxUSE_LIBTIFF       0
 
+#define wxUSE_TGA           0
+
 #define wxUSE_GIF           0
 
 #define wxUSE_PNM           0
@@ -506,6 +527,15 @@
 
 #define wxUSE_PALETTE       0
 
+
+#define wxUSE_ALL_THEMES    0
+
+#define wxUSE_THEME_GTK     0
+#define wxUSE_THEME_METAL   0
+#define wxUSE_THEME_MONO    0
+#define wxUSE_THEME_WIN32   0
+
+
 /* --- end common options --- */
 
 /* for some features we don't have dedicated configure switches, so just choose
@@ -567,6 +597,11 @@
  */
 #undef VA_LIST_IS_ARRAY
 
+/*
+ * Define if the compiler supports variadic macros
+ */
+#undef HAVE_VARIADIC_MACROS
+
 /*
  * Define if your compiler has std::wstring
  */
@@ -690,9 +725,11 @@
  */
 #define wxUSE_X_RESOURCES 0
 /*
- * Use OLE (MSW only)
+ * Use OLE and OLE Automation (MSW only)
  */
 #define wxUSE_OLE 0
+#define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
@@ -723,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
 
@@ -831,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
 
@@ -853,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
 
@@ -1054,7 +1103,14 @@
 /* Define this if you have wprintf() and related functions */
 #undef HAVE_WPRINTF
 
-/* Define this if you have wprintf() and related functions */
+/* Define this if you have swprintf() */
+#undef HAVE_SWPRINTF
+
+/* Define if you have a _broken_ swprintf() declaration in the header,
+ * without a 'size_t max' parameter as second argument */
+#undef HAVE_BROKEN_SWPRINTF_DECL
+
+/* Define this if you have vswprintf() and related functions */
 #undef HAVE_VSWPRINTF
 
 /* Define this if you have _vsnwprintf */
@@ -1081,6 +1137,12 @@
 /* Define if you have Pango xft support */
 #undef HAVE_PANGO_XFT
 
+/* Define if you have the <sys/select.h> header file.  */
+#undef HAVE_SYS_SELECT_H
+
+/* Define if fdopen is available.  */
+#undef HAVE_FDOPEN
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */
@@ -1096,6 +1158,13 @@
  */
 #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
+
+/* Define if the header pbt.h is missing.  */
+#undef NEED_PBT_H
+
 #endif /* __WIN32__ */
 
 /* --------------------------------------------------------*
@@ -1114,6 +1183,5 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 
-
 #endif /* __WX_SETUP_H__ */