wxArrayStringProperty::m_delimiter default value was missing. Also cleaned up relevan...

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 9ce60367b4b3d73d0a8abe318f39364cd1a2da0f..667087f1ed703f9abed5a2c775a8570304df284c 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -323,7 +323,25 @@
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 
 

+
+#ifdef _MSC_VER
+#   if _MSC_VER >= 1310
+
+

 #define wxUSE_GRAPHICS_CONTEXT 0
 #define wxUSE_GRAPHICS_CONTEXT 0

+#   else
+
+
+#       define wxUSE_GRAPHICS_CONTEXT 0
+#   endif
+#else
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
+#endif

 
 
 #define wxUSE_CONTROLS     0
 
 
 #define wxUSE_CONTROLS     0


@@ -467,6 +485,8 @@
 
 #define wxUSE_ABOUTDLG 0
 
 
 #define wxUSE_ABOUTDLG 0
 

+#define wxUSE_FILE_HISTORY 0
+

 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0


@@ -698,6 +718,16 @@
  */
 #undef HAVE_TR1_UNORDERED_SET
 
  */
 #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.
  */
 /*
  * Define if the compiler supports simple visibility declarations.
  */