Added 'Delimiter' attribute for wxArrayStringProperty. Moved static ArrayStringToStri...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 10eb975c5d092fc642dffaefe3ae5b8110f4eee3..667087f1ed703f9abed5a2c775a8570304df284c 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.10 */
 #undef __WXGTK210__
 
+/* Define this if your version of GTK+ is greater than 2.18 */
+#undef __WXGTK218__
+
 /* Define this if you want to use GPE features */
 #undef __WXGPE__
 
@@ -94,6 +97,7 @@
 #undef __NETBSD__
 #undef __OPENBSD__
 #undef __OSF__
+#undef __QNX__
 #undef __SGI__
 #undef __SOLARIS__
 #undef __SUN__
@@ -242,6 +246,8 @@
 
 #define wxUSE_STOPWATCH     0
 
+#define wxUSE_FSWATCHER     0
+
 #define wxUSE_CONFIG        0
 
 #define wxUSE_CONFIG_NATIVE   0
@@ -294,6 +300,8 @@
 
 #define wxUSE_VARIANT 0
 
+#define wxUSE_ANY 0
+
 #define wxUSE_REGEX       0
 
 #define wxUSE_SYSTEM_OPTIONS 0
@@ -308,15 +316,31 @@
 
 #define wxUSE_AUI       0
 
-#define wxUSE_RIBBON  0
+#define wxUSE_RIBBON    0
 
 #define wxUSE_PROPGRID  0
 
 #define wxUSE_STC 0
 
 
-#ifndef wxUSE_GRAPHICS_CONTEXT
+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+
 #define wxUSE_GRAPHICS_CONTEXT 0
+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
 
@@ -407,6 +431,8 @@
 
 #define wxUSE_IMAGLIST      0
 
+#define wxUSE_INFOBAR       0
+
 #define wxUSE_MENUS         0
 
 #define wxUSE_NOTIFICATION_MESSAGE 0
@@ -459,6 +485,8 @@
 
 #define wxUSE_ABOUTDLG 0
 
+#define wxUSE_FILE_HISTORY 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -512,6 +540,8 @@
 #define wxUSE_MOUSEWHEEL        0
 
 
+#define wxUSE_UIACTIONSIMULATOR 0
+
 
 #define wxUSE_POSTSCRIPT  0
 
@@ -688,6 +718,16 @@
  */
 #undef HAVE_TR1_UNORDERED_SET
 
+/*
+ * Define if your compiler has <tr1/type_traits>
+ */
+#undef HAVE_TR1_TYPE_TRAITS
+
+/*
+ * Define if your compiler has <type_traits>
+ */
+#undef HAVE_TYPE_TRAITS
+
 /*
  * Define if the compiler supports simple visibility declarations.
  */
@@ -740,6 +780,10 @@
  * Use the Hildon framework
  */
 #define wxUSE_LIBHILDON 0
+/*
+ * Use the Hildon 2.0 framework
+ */
+#define wxUSE_LIBHILDON2 0
 /*
  * Have glibc2
  */
@@ -1148,6 +1192,12 @@
 /* Define if locale_t is available */
 #undef HAVE_LOCALE_T
 
+/* Define if you have inotify_xxx() functions. */
+#undef wxHAS_INOTIFY
+
+/* Define if you have kqueu_xxx() functions. */
+#undef wxHAS_KQUEUE
+
 /* -------------------------------------------------------------------------
    Win32 adjustments section
    ------------------------------------------------------------------------- */