/*
Compiler-specific checks.
*/
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+
+// Only MSVC 7+ has gdiplus.h, add exceptions for other compilers here if they
+// can support it too (but notice that Borland currently dies in
+// src/msw/gdiplus.cpp with "macro expansion too long" error even if the header
+// is available)
+#if !wxCHECK_VISUALC_VERSION(7)
+ #undef wxUSE_GRAPHICS_CONTEXT
+ #define wxUSE_GRAPHICS_CONTEXT 0
+#endif
+
+// Borland
+#ifdef __BORLANDC__
+
+#if __BORLANDC__ < 0x500
/* BC++ 4.0 can't compile JPEG library */
# undef wxUSE_LIBJPEG
# define wxUSE_LIBJPEG 0
#endif
/* wxUSE_DEBUG_NEW_ALWAYS = 1 not compatible with BC++ in DLL mode */
-#if defined(__BORLANDC__) && (defined(WXMAKINGDLL) || defined(WXUSINGDLL))
+#if defined(WXMAKINGDLL) || defined(WXUSINGDLL)
# undef wxUSE_DEBUG_NEW_ALWAYS
# define wxUSE_DEBUG_NEW_ALWAYS 0
#endif
+#endif /* __BORLANDC__ */
+
/* DMC++ doesn't have definitions for date picker control, so use generic control
*/
#ifdef __DMC__
# define wxUSE_POSTSCRIPT 1
#endif
-/* VC6 can't handle the templates for the 'type safe events': */
-#if !wxEVENTS_COMPATIBILITY_2_8
-# ifdef __VISUALC6__
-# undef wxEVENTS_COMPATIBILITY_2_8
-# define wxEVENTS_COMPATIBILITY_2_8 1
-# endif
-#endif
-
#endif /* _WX_MSW_CHKCONF_H_ */