New icon for combobox with bitmaps. Improved readability of icons on dark backgrounds...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index ab4f865fc2717a28f6118da48b84525b8e6a85bd..b8dc454d474c00c35869db8272d8e36f0cf757c0 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
@@ -292,6 +294,9 @@
 #define wxUSE_AUI       0
 
 
+#define wxUSE_GRAPHICS_CONTEXT 0
+
+
 #define wxUSE_CONTROLS     0
 
 #define wxUSE_POPUPWIN     0
@@ -356,6 +361,8 @@
 
 #define wxUSE_ODCOMBOBOX 0
 
+#define wxUSE_BITMAPCOMBOBOX 0
+
 
 #define wxUSE_ACCEL 0
 
@@ -449,8 +456,6 @@
 
 #define wxUSE_HELP        0
 
-#define wxUSE_MS_HTML_HELP 0
-
 
 #define wxUSE_WXHTML_HELP 0
 
@@ -506,6 +511,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 +581,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 +709,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
@@ -1054,7 +1075,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 */
@@ -1103,7 +1131,7 @@
  * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
 #undef HAVE_BOOLEAN
 
-/* Define is the header pbt.h is missing.  */
+/* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H
 
 #endif /* __WIN32__ */
@@ -1124,6 +1152,5 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 
-
 #endif /* __WX_SETUP_H__ */