Converts DOS line endings to Unix if necessary

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index c6090c0bcb2554958d9420633d870138dee053c9..fbeee17c56a2ced4f7094c569141a2065380c33c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -271,6 +271,8 @@
 
 #define wxUSE_URL_NATIVE 0
 
+#define wxUSE_VARIANT 0
+
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0
@@ -356,6 +358,8 @@
 
 #define wxUSE_ODCOMBOBOX 0
 
+#define wxUSE_BITMAPCOMBOBOX 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -449,8 +453,6 @@
 
 #define wxUSE_HELP        0
 
-#define wxUSE_MS_HTML_HELP 0
-
 
 #define wxUSE_WXHTML_HELP 0
 
@@ -567,6 +569,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 +697,10 @@
  */
 #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
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
@@ -1054,7 +1062,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 */