rebake make/project files for new scintilla

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index fc43f2c17b2ce75238a0935f1e9bd0e72aef2fcc..8d690563561a6896451c16c6d873302293e0f118 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -68,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 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__
 
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 


@@ -202,6 +205,7 @@
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 
 
 #define wxUSE_PRINTF_POS_PARAMS      0
 

+#define wxUSE_COMPILER_TLS 0

 
 
 #define wxUSE_STL 0
 
 
 #define wxUSE_STL 0


@@ -330,10 +334,17 @@
 
 #define wxUSE_WEBVIEW 0
 
 
 #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
 
 
 #ifdef _MSC_VER


@@ -404,6 +415,7 @@
 #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_TREELISTCTRL  0
 #define wxUSE_TOGGLEBTN     0
 #define wxUSE_TREECTRL      0
 #define wxUSE_TREELISTCTRL  0


@@ -462,6 +474,8 @@
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
 

+#define wxUSE_RICHTOOLTIP 0
+

 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0
 #define wxUSE_SASH          0
 
 #define wxUSE_SPLITTER      0


@@ -671,6 +685,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 --- */


@@ -807,9 +823,9 @@
  */
 #define wxUSE_LIBHILDON2 0
 /*
  */
 #define wxUSE_LIBHILDON2 0
 /*

- * Have glibc2
+ * Use libnotify library.

  */
  */

-#define wxHAVE_GLIBC2 0
+#define wxUSE_LIBNOTIFY 0

 /*
  * Use libXpm
  */
 /*
  * Use libXpm
  */


@@ -1109,6 +1125,9 @@
 /* Define if you have thr_setconcurrency function */
 #undef HAVE_THR_SETCONCURRENCY
 
 /* 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
 
 /* Define if you have the uname function.  */
 #undef HAVE_UNAME