Correct check for MSVC version in wxUSE_GRAPHICS_CONTEXT definition.

Set wxUSE_GRAPHICS_CONTEXT to 1 by default for MSVC 7.1+ and not 8+.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h
index 00db8cc364fb9aa894d27d3770e6d01ef1d256bf..c035b658faf17601379dbc03eb96536c1929f554 100644 (file)
--- a/include/wx/motif/setup0.h
+++ b/include/wx/motif/setup0.h
@@ -671,9 +671,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 326ca9073340a5dcca90819c50500a6bc24654a2..924ef6f98e0555bc530e866670e01fe6075f5916 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -671,9 +671,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/msw/wince/setup.h b/include/wx/msw/wince/setup.h
index 94e1cc63eb948c3c84401d29b583974568b788af..880ac1c5cf0a2bf4bea1d6bee1281b8d44d29448 100644 (file)
--- a/include/wx/msw/wince/setup.h
+++ b/include/wx/msw/wince/setup.h
@@ -671,9 +671,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/os2/setup0.h b/include/wx/os2/setup0.h
index 9629934fe317c1eeb4f47b07f88e2d213060d95f..0e38cfa189959e8f4d1495fc3c07080d3181aeab 100644 (file)
--- a/include/wx/os2/setup0.h
+++ b/include/wx/os2/setup0.h
@@ -671,9 +671,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h
index 709bc320b6c0ca45715ac46fcaeb33bcb7a92040..97f4709ce6d7efcb24888cbd4d41bd549c30c138 100644 (file)
--- a/include/wx/osx/setup0.h
+++ b/include/wx/osx/setup0.h
@@ -672,9 +672,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/palmos/setup0.h b/include/wx/palmos/setup0.h
index 8b67622a11edbc278527a4e40b3fb704e3db3ffc..71f12caea427f6672e6ed8fe45f473d4c27386b9 100644 (file)
--- a/include/wx/palmos/setup0.h
+++ b/include/wx/palmos/setup0.h
@@ -671,9 +671,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 59ee2bec16b2b89617a63698cdab1abac56a946a..147f226c2ea30e815144ed619e3556f336e6f565 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -667,9 +667,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h
index 8bb1f531c77cfe039e3d95b7070248ad6f73d1f2..d42ad35528e8301a97770e5de61c19347680563d 100644 (file)
--- a/include/wx/univ/setup0.h
+++ b/include/wx/univ/setup0.h
@@ -670,9 +670,9 @@
 // notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
 // included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
-        // MSVC7+ comes with new enough Platform SDK, enable wxGraphicsContext
-        // support for it
+#   if _MSC_VER >= 1310
+        // MSVC7.1+ comes with new enough Platform SDK, enable
+        // wxGraphicsContext support for it
 #       define wxUSE_GRAPHICS_CONTEXT 1
 #   else
         // MSVC 6 didn't include GDI+ headers so disable by default, enable it

diff --git a/setup.h.in b/setup.h.in
index c97a5cbfe342ca9fc885842ffd8c7b818458f40c..16aa2ae372da0270bba55349514958f2cbfb6a16 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -325,7 +325,7 @@
 
 
 #ifdef _MSC_VER
-#   if _MSC_VER >= 1400
+#   if _MSC_VER >= 1310
 
 
 #define wxUSE_GRAPHICS_CONTEXT 0