added more message names to wxGetMessageName() (modified patch 1611819)

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index e718230c58e10d650a3e8e1e6f2e26ecf52324b5..65759d96c3f83276fabb0961eb9efc23898ec4ef 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.6 */
 #undef __WXGTK26__
 
+/* Define this if your version of GTK+ is greater than 2.10 */
+#undef __WXGTK210__
+
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
@@ -125,9 +128,6 @@
 #undef __WINDOWS__
 #endif
 
-#ifndef __WIN95__
-#undef __WIN95__
-#endif
 #ifndef __WIN32__
 #undef __WIN32__
 #endif
@@ -151,10 +151,10 @@
 #endif
 
 
-#define WXWIN_COMPATIBILITY_2_4 0
-
 #define WXWIN_COMPATIBILITY_2_6 0
 
+#define WXWIN_COMPATIBILITY_2_8 0
+
 #define wxDIALOG_UNIT_COMPATIBILITY   0
 
 
@@ -332,6 +332,7 @@
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
 #define wxUSE_SCROLLBAR     0
+#define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
 #define wxUSE_SPINBTN       0
 #define wxUSE_SPINCTRL      0
@@ -540,13 +541,13 @@
 
 /* for some features we don't have dedicated configure switches, so just choose
  * the common values automatically */
-#if (defined(__WIN95__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
+#if (defined(__WIN32__) && !defined(__WXUNIVERSAL__)) || defined(__WXPM__)
 #define wxUSE_OWNER_DRAWN 1
 #else
 #define wxUSE_OWNER_DRAWN 0
 #endif
 
-#if defined(__WIN95__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
+#if defined(__WIN32__) && !defined(__WINE__) && !defined(__GNUWIN32_OLD__)
 #define wxUSE_RICHEDIT 1
 #define wxUSE_RICHEDIT2 1
 #else
@@ -806,6 +807,9 @@
 /* Define if fsync() is available */
 #undef HAVE_FSYNC
 
+/* Define if round() is available */
+#undef HAVE_ROUND
+
 /* Define if you have ftime() */
 #undef HAVE_FTIME
 
@@ -833,6 +837,9 @@
 /* Define if you have pthread_cancel */
 #undef HAVE_PTHREAD_CANCEL
 
+/* Define if you have pthread_mutex_timedlock */
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+
 /* Define if you have pthread_attr_setstacksize */
 #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE
 
@@ -1161,9 +1168,9 @@
  */
 #define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
 
-/* Define if the system headers declare the type boolean (which will conflict
- * with the jpeg headers unless HAVE_BOOLEAN is defined).  */
-#undef HAVE_BOOLEAN
+/* 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
 
 /* Define if the header pbt.h is missing.  */
 #undef NEED_PBT_H