Make web sample XPMs const to fix compiler warnings on gcc.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index fe2e031afbfe266ee60de2f9e08aa50a93d1585e..54288e8af764bf7971607f719df681dd565de3fa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -216,11 +216,7 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
-#if defined(_MSC_VER) && _MSC_VER < 1300
-    #define wxUSE_STD_CONTAINERS 0
-#else
-    #define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
-#endif
+#define wxUSE_STD_CONTAINERS 0
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
@@ -335,6 +331,12 @@
 
 #define wxUSE_STC 0
 
+#define wxUSE_WEB 0
+
+#define wxUSE_WEBVIEW_WEBKIT 0
+
+#define wxUSE_WEBVIEW_IE     0
+
 
 
 #ifdef _MSC_VER
@@ -573,6 +575,8 @@
 
 #define wxUSE_SVG 0
 
+#define wxUSE_DC_TRANSFORM_MATRIX 0
+
 
 
 #define wxUSE_IMAGE         0