No real changes, just cleanup of wxMSW MenuDrawData.

[wxWidgets.git] / setup.h.in

diff --git a/setup.h.in b/setup.h.in
index 0519dabb7def4b1a9ad209a03105ee70e6977f4e..b975213e2a05681670f8f905774533f27acafec6 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -323,10 +323,24 @@
 #define wxUSE_STC 0
 
 
-#if !defined(__WXMSW__) || wxCHECK_VISUALC_VERSION(7)
-    #define wxUSE_GRAPHICS_CONTEXT 0
+
+#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
+
+
+
+
+
+#   define wxUSE_GRAPHICS_CONTEXT 0
 #endif
 
 
@@ -346,6 +360,7 @@
 #define wxUSE_COLLPANE      0
 #define wxUSE_COLOURPICKERCTRL 0
 #define wxUSE_COMBOBOX      0
+#define wxUSE_COMMANDLINKBUTTON 0
 #define wxUSE_DATAVIEWCTRL  0
 #define wxUSE_DATEPICKCTRL  0
 #define wxUSE_DIRPICKERCTRL 0
@@ -360,6 +375,7 @@
 #define wxUSE_LISTCTRL      0
 #define wxUSE_RADIOBOX      0
 #define wxUSE_RADIOBTN      0
+#define wxUSE_RICHMSGDLG    0
 #define wxUSE_SCROLLBAR     0
 #define wxUSE_SEARCHCTRL    0
 #define wxUSE_SLIDER        0
@@ -471,6 +487,8 @@
 
 #define wxUSE_ABOUTDLG 0
 
+#define wxUSE_FILE_HISTORY 0
+
 
 #define wxUSE_METAFILE              0
 #define wxUSE_ENH_METAFILE          0
@@ -702,6 +720,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.
  */