X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5bdfc69a576eb32f680f962feec04935f6e71eb..2bcada5f33151d366b9d4c9e5e37c706dab23b27:/setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6ac7576dbc..26ae556bdb 100644
--- 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
 
-/* 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__
 
@@ -189,8 +186,6 @@
 
 #define wxUSE_EXTENDED_RTTI 0
 
-#define wxUSE_STL 0
-
 #define wxUSE_LOG 0
 
 #define wxUSE_LOGWINDOW 0
@@ -205,6 +200,12 @@
 
 #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
@@ -212,11 +213,16 @@
     #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_PRINTF_POS_PARAMS      0
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
+
+#define wxUSE_IOSTREAMH     0
+
 
 
 #define wxUSE_LONGLONG      0
@@ -322,6 +328,19 @@
 
 #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
@@ -356,6 +375,7 @@
 #define wxUSE_TIPWINDOW    0
 
 #define wxUSE_ANIMATIONCTRL 0
+#define wxUSE_BANNERWINDOW  0
 #define wxUSE_BUTTON        0
 #define wxUSE_BMPBUTTON     0
 #define wxUSE_CALENDARCTRL  0
@@ -391,8 +411,10 @@
 #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_TREELISTCTRL  0
 
 #define wxUSE_STATUSBAR    0
 
@@ -560,10 +582,7 @@
 
 #define wxUSE_SVG 0
 
-
-#define REMOVE_UNUSED_ARG   0
-
-#define wxUSE_IOSTREAMH     0
+#define wxUSE_DC_TRANSFORM_MATRIX 0
 
 
 
@@ -660,6 +679,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */