From 1b5f83357d8a50f58eb49fab9a4667575f7b2ffb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Apr 2009 14:08:05 +0000 Subject: [PATCH] disable wxGC for Borland as it can't compiler the macros used in msw/gdiplus.cpp git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60349 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/chkconf.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index d1d30c7c24..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__ -- 2.45.2