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 770c6fb9c2374c68be1100821a05124d976be1f4..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


@@ -343,9 +358,14 @@
 #   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
 #   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 

+#define wxUSE_CAIRO 0
+
+

 
 #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


@@ -360,6 +380,7 @@
 #define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
 #define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0

+#define wxUSE_COMMANDLINKBUTTON 0

 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_DATEPICKCTRL  0
 #define wxUSE_DIRPICKERCTRL 0
 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_DATEPICKCTRL  0
 #define wxUSE_DIRPICKERCTRL 0


@@ -374,6 +395,7 @@
 #define wxUSE_LISTCTRL      0
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_LISTCTRL      0
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0

+#define wxUSE_RICHMSGDLG    0

 #define wxUSE_SCROLLBAR     0
 #define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SCROLLBAR     0
 #define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0


@@ -421,6 +443,10 @@
 
 #define wxUSE_ACCEL 0
 
 
 #define wxUSE_ACCEL 0
 

+#define wxUSE_ARTPROVIDER_STD 0
+
+#define wxUSE_ARTPROVIDER_TANGO 0
+

 #define wxUSE_HOTKEY 0
 
 #define wxUSE_CARET         0
 #define wxUSE_HOTKEY 0
 
 #define wxUSE_CARET         0


@@ -549,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

 
 
 
 
 
 


@@ -718,6 +741,16 @@
  */
 #undef HAVE_TR1_UNORDERED_SET
 
  */
 #undef HAVE_TR1_UNORDERED_SET
 

+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+#undef HAVE_TR1_TYPE_TRAITS
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#undef HAVE_TYPE_TRAITS
+

 /*
  * Define if the compiler supports simple visibility declarations.
  */
 /*
  * Define if the compiler supports simple visibility declarations.
  */


@@ -966,6 +999,9 @@
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 
 /* Define if you have wcsdup function  */
 #undef HAVE_WCSDUP
 

+/* Define if you have wcsftime() function  */
+#undef HAVE_WCSFTIME
+

 /* Define if you have strnlen() function */
 #undef HAVE_STRNLEN
 
 /* Define if you have strnlen() function */
 #undef HAVE_STRNLEN