Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 76e8e8d0c90e140f0b658def5c252bf003b84d8b..97fcb89a6a7d0d86076bf89e0aff890d29e24381 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
 
-/* 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__
 
@@ -216,7 +213,7 @@
     #define wxUSE_STD_DEFAULT  0
 #endif
 
-#define wxUSE_STD_CONTAINERS wxUSE_STD_DEFAULT
+#define wxUSE_STD_CONTAINERS 0
 
 #define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
 
@@ -331,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
@@ -365,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
@@ -400,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
 
@@ -457,6 +470,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
+#define wxUSE_RICHTOOLTIP 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -569,6 +584,8 @@
 
 #define wxUSE_SVG 0
 
+#define wxUSE_DC_TRANSFORM_MATRIX 0
+
 
 
 #define wxUSE_IMAGE         0
@@ -664,6 +681,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
@@ -799,10 +818,6 @@
  * Use the Hildon 2.0 framework
  */
 #define wxUSE_LIBHILDON2 0
-/*
- * Have glibc2
- */
-#define wxHAVE_GLIBC2 0
 /*
  * Use libXpm
  */