Rebake the rest of the files after TOOLKIT change in MSW bakefile.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 6921bbf89005c09e8ffcb51b23e5831662202de1..75588db31162e2481601842e9fe3b1e27db2f239 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__
 
@@ -71,6 +68,9 @@
 /* Define this if your version of GTK+ is greater than 2.18 */
 #undef __WXGTK218__
 
+/* Define this if your version of GTK+ is >= 3.0 */
+#undef __WXGTK3__
+
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
@@ -205,6 +205,7 @@
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
+#define wxUSE_COMPILER_TLS 0
 
 
 #define wxUSE_STL 0
@@ -333,10 +334,17 @@
 
 #define wxUSE_WEBVIEW 0
 
-#define wxUSE_WEBVIEW_WEBKIT 0
-
-#define wxUSE_WEBVIEW_IE     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
@@ -371,6 +379,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
@@ -406,8 +415,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
 
@@ -463,6 +474,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
+#define wxUSE_RICHTOOLTIP 0
+
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
@@ -672,6 +685,8 @@
 
 #define wxUSE_DATEPICKCTRL_GENERIC 0
 
+#define wxUSE_TIMEPICKCTRL_GENERIC 0
+
 
 #define wxUSE_CRASHREPORT 0
 /* --- end MSW options --- */
@@ -808,9 +823,13 @@
  */
 #define wxUSE_LIBHILDON2 0
 /*
- * Have glibc2
+ * Use libnotify library.
+ */
+#define wxUSE_LIBNOTIFY 0
+/*
+ * Use libnotify 0.7+ API.
  */
-#define wxHAVE_GLIBC2 0
+#define wxUSE_LIBNOTIFY_0_7 0
 /*
  * Use libXpm
  */
@@ -1110,6 +1129,9 @@
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
+/* Define if you have pthread_setconcurrency function */
+#undef HAVE_PTHREAD_SET_CONCURRENCY
+
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME
 
@@ -1203,6 +1225,9 @@
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
+/* Define if you have abi::__forced_unwind in your <cxxabi.h>. */
+#undef HAVE_ABI_FORCEDUNWIND
+
 /* Define if fdopen is available.  */
 #undef HAVE_FDOPEN
 
@@ -1215,6 +1240,9 @@
 /* Define if getgrgid_r is available. */
 #undef HAVE_GETGRGID_R
 
+/* Define if setpriority() is available. */
+#undef HAVE_SETPRIORITY
+
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 
@@ -1230,10 +1258,6 @@
 
 #ifdef __WIN32__
 
-/* we need to define wxUSE_XPM_IN_MSW for MSW compilation for compatibility
-   with wx/msw/setup.h */
-#define wxUSE_XPM_IN_MSW wxUSE_XPM
-
 /* When using an external jpeg library and the Windows headers already define
  * boolean, define to the type used by the jpeg library for boolean.  */
 #undef wxHACK_BOOLEAN