X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3ff831f3be88834579fc9a0ce17f24745650faf..c81aea07393c320a930a63eafbc762f7c404b989:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index d1d30c7c24..b62f30c5c1 100644
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -238,18 +238,28 @@
 /*
    Compiler-specific checks.
  */
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
+
+// 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
 
+/* compiling src/msw/gdiplus.cpp results in "macro expansion too long" error */
+#undef wxUSE_GRAPHICS_CONTEXT
+#define wxUSE_GRAPHICS_CONTEXT 0
+
+#endif /* __BORLANDC__ */
+
 /* DMC++ doesn't have definitions for date picker control, so use generic control
  */
 #ifdef __DMC__
@@ -401,15 +411,4 @@
 #   define wxUSE_POSTSCRIPT 1
 #endif
 
-/*
-   Currently only recent MSVC compilers can build the new events code under
-   Windows.
- */
-#if !wxEVENTS_COMPATIBILITY_2_8
-#   if !wxCHECK_VISUALC_VERSION(7)
-#       undef wxEVENTS_COMPATIBILITY_2_8
-#       define wxEVENTS_COMPATIBILITY_2_8 1
-#   endif
-#endif
-
 #endif /* _WX_MSW_CHKCONF_H_ */