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 b1f8916a9f43c33f6c570a597ab87f4e467e066c..54288e8af764bf7971607f719df681dd565de3fa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -189,8 +189,6 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
 
 #define wxUSE_EXTENDED_RTTI 0
 

-#define wxUSE_STL 0
-

 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0
 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0


@@ -205,6 +203,12 @@
 
 #define wxUSE_STREAMS       0
 
 
 #define wxUSE_STREAMS       0
 

+#define wxUSE_PRINTF_POS_PARAMS      0
+
+
+
+#define wxUSE_STL 0
+

 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0
 #if defined(__DMC__) || defined(__WATCOMC__) \
         || (defined(_MSC_VER) && _MSC_VER < 1200)
     #define wxUSE_STD_DEFAULT  0


@@ -212,11 +216,16 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
     #define wxUSE_STD_DEFAULT  0
 #endif
 

+#define wxUSE_STD_CONTAINERS 0
+

 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
 #define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
 

-#define wxUSE_PRINTF_POS_PARAMS      0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     0
+

 
 
 #define wxUSE_LONGLONG      0
 
 
 #define wxUSE_LONGLONG      0


@@ -322,6 +331,12 @@
 
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 

+#define wxUSE_WEB 0
+
+#define wxUSE_WEBVIEW_WEBKIT 0
+
+#define wxUSE_WEBVIEW_IE     0
+

 
 
 #ifdef _MSC_VER
 
 
 #ifdef _MSC_VER


@@ -349,6 +364,8 @@
 
 #define wxUSE_CONTROLS     0
 
 
 #define wxUSE_CONTROLS     0
 

+#define wxUSE_MARKUP       0
+

 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0
 #define wxUSE_POPUPWIN     0
 
 #define wxUSE_TIPWINDOW    0


@@ -558,10 +575,7 @@
 
 #define wxUSE_SVG 0
 
 
 #define wxUSE_SVG 0
 

-
-#define REMOVE_UNUSED_ARG   0
-
-#define wxUSE_IOSTREAMH     0
+#define wxUSE_DC_TRANSFORM_MATRIX 0