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

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 375f080b71..f855d59ab5 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__
@@ -402,14 +412,11 @@
 #endif
 
 /*
-   Currently MSVC can't build the library with new-style events:
-    - VC6 simply doesn't have good enough templates support
-    - VC7 always seems to choos the Connect() overload using Functor, even when
-    the argument is a class method
-    - VC9 compiles the code fine but fails at linking stage in DLL build
+   Currently only recent MSVC compilers can build the new events code under
+   Windows.
  */
 #if !wxEVENTS_COMPATIBILITY_2_8
-#   if defined(__VISUALC__)
+#   if !wxCHECK_VISUALC_VERSION(7)
 #       undef wxEVENTS_COMPATIBILITY_2_8
 #       define wxEVENTS_COMPATIBILITY_2_8 1
 #   endif