Fix for assert in setting image from file by Jaakko Salli.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index fbeee17c56a2ced4f7094c569141a2065380c33c..60df19067f866a19f6ee563685a63844a3040846 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -294,12 +294,18 @@
 #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
@@ -415,6 +421,8 @@
 
 #define wxUSE_WIZARDDLG 0
 
+#define wxUSE_ABOUTDLG 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -454,6 +462,9 @@
 #define wxUSE_HELP        0
 
 
+#define wxUSE_MS_HTML_HELP 0
+
+
 #define wxUSE_WXHTML_HELP 0
 
 #define wxUSE_RESOURCES   0
@@ -508,6 +519,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
@@ -701,6 +721,7 @@
  */
 #define wxUSE_OLE 0
 #define wxUSE_OLE_AUTOMATION 0
+#define wxUSE_ACTIVEX 0
 
 /* for compatibility */
 #define wxUSE_WX_RESOURCES wxUSE_RESOURCES
@@ -1139,6 +1160,5 @@
 /* define this when wxDC::Blit() respects SetDeviceOrigin() in wxGTK */
 #undef wxHAS_WORKING_GTK_DC_BLIT
 
-
 #endif /* __WX_SETUP_H__ */