X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58bd3862b82749175bd04809607d82f1b22f0300..ca6911c361b04290fe1f0e64b616249b3b3d71ba:/include/wx/msw/chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index c5d0b77e83..db029d3d0e 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,11 +411,13 @@
 #   define wxUSE_POSTSCRIPT 1
 #endif
 
-/* VC6 and 7 currently can't handle template Connect() overloads: */
-#if !wxEVENTS_COMPATIBILITY_2_8
-#   if defined(__VISUALC__) && !wxCHECK_VISUALC_VERSION(8)
-#       undef wxEVENTS_COMPATIBILITY_2_8
-#       define wxEVENTS_COMPATIBILITY_2_8 1
+/*
+   Currently only recent MSVC compilers can build the new events code under
+   Windows.
+ */
+#ifdef wxHAS_EVENT_BIND
+#   if !wxCHECK_VISUALC_VERSION(7)
+#       undef wxHAS_EVENT_BIND
 #   endif
 #endif