diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h
index 0bf61bf0b4..f97c5d8d13 100644
--- a/include/wx/gtk/setup0.h
+++ b/include/wx/gtk/setup0.h
@@ -1479,7 +1479,7 @@
 //
 // Recommended setting: 1 if you need to support XP, as Direct2D is not
 // available there.
-#define wxUSE_GRAPHICS_GDIPLUS 1
+#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
 
 // Enable support for Direct2D-based implementation of wxGraphicsContext.
 //
@@ -1491,7 +1491,7 @@
 // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
 // systems will fall back on using GDI+).
 #if defined(_MSC_VER) && _MSC_VER >= 1600
-    #define wxUSE_GRAPHICS_DIRECT2D 1
+    #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
 #else
     #define wxUSE_GRAPHICS_DIRECT2D 0
 #endif
diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 04a95f3a79..c6d6b3112e 100644
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -1479,7 +1479,7 @@
 //
 // Recommended setting: 1 if you need to support XP, as Direct2D is not
 // available there.
-#define wxUSE_GRAPHICS_GDIPLUS 1
+#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
 
 // Enable support for Direct2D-based implementation of wxGraphicsContext.
 //
@@ -1491,7 +1491,7 @@
 // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
 // systems will fall back on using GDI+).
 #if defined(_MSC_VER) && _MSC_VER >= 1600
-    #define wxUSE_GRAPHICS_DIRECT2D 1
+    #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
 #else
     #define wxUSE_GRAPHICS_DIRECT2D 0
 #endif
diff --git a/include/wx/msw/setup_inc.h b/include/wx/msw/setup_inc.h
index 5cb1404ab7..21baf4e092 100644
--- a/include/wx/msw/setup_inc.h
+++ b/include/wx/msw/setup_inc.h
@@ -19,7 +19,7 @@
 //
 // Recommended setting: 1 if you need to support XP, as Direct2D is not
 // available there.
-#define wxUSE_GRAPHICS_GDIPLUS 1
+#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
 
 // Enable support for Direct2D-based implementation of wxGraphicsContext.
 //
@@ -31,7 +31,7 @@
 // 7 and later systems (if wxUSE_GRAPHICS_GDIPLUS is also enabled, earlier
 // systems will fall back on using GDI+).
 #if defined(_MSC_VER) && _MSC_VER >= 1600
-    #define wxUSE_GRAPHICS_DIRECT2D 1
+    #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
 #else
     #define wxUSE_GRAPHICS_DIRECT2D 0
 #endif
diff --git a/setup.h.in b/setup.h.in
index c5440def1c..2dd14ffb0e 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -635,10 +635,10 @@
 /* --- start MSW options --- */
 
 
-#define wxUSE_GRAPHICS_GDIPLUS 0
+#define wxUSE_GRAPHICS_GDIPLUS wxUSE_GRAPHICS_CONTEXT
 
 #if defined(_MSC_VER) && _MSC_VER >= 1600
-    #define wxUSE_GRAPHICS_DIRECT2D 0
+    #define wxUSE_GRAPHICS_DIRECT2D wxUSE_GRAPHICS_CONTEXT
 #else
     #define wxUSE_GRAPHICS_DIRECT2D 0
 #endif