aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authornyamatongwe <unknown>2012-07-17 19:38:23 +1000
committernyamatongwe <unknown>2012-07-17 19:38:23 +1000
commite281ed8bacd81de0ff49340ba817fa5a2908d71b (patch)
tree9a80595e3ff9fb9fd3364a443a7a758a9d91d584 /win32/ScintillaWin.cxx
parentc2de152d26b99e2858618a2cd5394f2a0ea3796a (diff)
downloadscintilla-mirror-e281ed8bacd81de0ff49340ba817fa5a2908d71b.tar.gz
Refine checking for Direct2D and DirectWrite by using NTDDI_WIN7 to indicate
a recent SDK and allow disabling Direct2D by defining DISABLE_D2D. Run a test compile of a file that includes these headers and use compilation failure to disable Direct2D.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 367e33466..2caa685a1 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -26,7 +26,7 @@
#include <richedit.h>
#include <windowsx.h>
-#if defined(_MSC_VER) && (_MSC_VER > 1200)
+#if defined(NTDDI_WIN7) && !defined(DISABLE_D2D)
#define USE_D2D 1
#endif