Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArc...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 39a678f315b75312b7a038331f554caaed6c7572..26ae556bdb10d8e3773a77aa012c4fffed980d3b 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -53,9 +53,6 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 

-/* Define this if your version of GTK+ is greater than 1.2 */
-#undef __WXGTK12__
-

 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 
 /* Define this if your version of GTK+ is greater than 1.2.7 */
 #undef __WXGTK127__
 


@@ -331,6 +328,19 @@
 
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 

+#define wxUSE_WEBVIEW 0
+
+#ifdef __WXMSW__
+#define wxUSE_WEBVIEW_IE 0
+#else
+#define wxUSE_WEBVIEW_IE 0
+#endif
+
+#if defined(__WXGTK__) || defined(__WXOSX__)
+#define wxUSE_WEBVIEW_WEBKIT 0
+#else
+#define wxUSE_WEBVIEW_WEBKIT 0
+#endif

 
 
 #ifdef _MSC_VER
 
 
 #ifdef _MSC_VER


@@ -365,6 +375,7 @@
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0

+#define wxUSE_BANNERWINDOW  0

 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0


@@ -400,8 +411,10 @@
 #define wxUSE_STATTEXT      0
 #define wxUSE_STATBMP       0
 #define wxUSE_TEXTCTRL      0
 #define wxUSE_STATTEXT      0
 #define wxUSE_STATBMP       0
 #define wxUSE_TEXTCTRL      0

+#define wxUSE_TIMEPICKCTRL  0

 #define wxUSE_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0
 #define wxUSE_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0

+#define wxUSE_TREELISTCTRL  0

 
 #define wxUSE_STATUSBAR    0
 
 
 #define wxUSE_STATUSBAR    0
 


@@ -666,6 +679,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 

+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+

 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */