no changes, just remove #if'd out code

[wxWidgets.git] / include / wx / msw / chkconf.h

diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h
index 930edc47a48832395dcc15db8dca2a86fbf2a444..f855d59ab56b623ee81c9d92bed483dd9844af0a 100644 (file)
--- a/include/wx/msw/chkconf.h
+++ b/include/wx/msw/chkconf.h
@@ -238,18 +238,28 @@
 /*
    Compiler-specific checks.
  */
 /*
    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 */
     /* 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
 
 #   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__
 /* DMC++ doesn't have definitions for date picker control, so use generic control
  */
 #ifdef __DMC__


@@ -401,4 +411,15 @@
 #   define wxUSE_POSTSCRIPT 1
 #endif
 
 #   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_ */
 #endif /* _WX_MSW_CHKCONF_H_ */