X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3c7789014106c9269b0f4ecc1a3071b14f351d3f..704006b381ff98a16a8ce122dd0ae30cad7a6fca:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index b1c8c9125c..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,12 +411,4 @@
 #   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_ */