From 4798fbc7d1d29a18c456f160cc8d2f54184eb61e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 24 Feb 2008 23:24:22 +0000 Subject: [PATCH] don't forcefully disable regex and tiff, they build fine with VC8 (and not eVC) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/wince/chkconf.h | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/include/wx/msw/wince/chkconf.h b/include/wx/msw/wince/chkconf.h index 3ec43b9b5a..fb0a9e19bf 100644 --- a/include/wx/msw/wince/chkconf.h +++ b/include/wx/msw/wince/chkconf.h @@ -45,10 +45,11 @@ #undef wxUSE_JOYSTICK #define wxUSE_JOYSTICK 0 -// and they're disabled for WinCE in build/bakefiles/{tiff|regex}.bkl so can't -// be enabled here -#undef wxUSE_LIBTIFF -#define wxUSE_LIBTIFF 0 +// libtiff doesn't build with eVC but is ok with VC8 +#if !wxCHECK_VISUALC_VERSION(8) + #undef wxUSE_LIBTIFF + #define wxUSE_LIBTIFF 0 +#endif // no MDI under CE #undef wxUSE_MDI @@ -75,13 +76,14 @@ #undef wxUSE_OWNER_DRAWN #define wxUSE_OWNER_DRAWN 0 -// libtiff and regex apparently don't compile with eVC (to check with eVC4?) -// other MSW settings not supported by CE #undef wxUSE_PRINTING_ARCHITECTURE #define wxUSE_PRINTING_ARCHITECTURE 0 -#undef wxUSE_REGEX -#define wxUSE_REGEX 0 +// regex doesn't build with eVC but is ok with VC8 +#if !wxCHECK_VISUALC_VERSION(8) + #undef wxUSE_REGEX + #define wxUSE_REGEX 0 +#endif #undef wxUSE_RICHEDIT #define wxUSE_RICHEDIT 0 @@ -95,9 +97,13 @@ #define wxUSE_STDPATHS 0 #endif // WCE_PLATFORM_STANDARDSDK +// there is no support for balloon taskbar icons +#undef wxUSE_TASKBARICON_BALLOONS +#define wxUSE_TASKBARICON_BALLOONS 0 + // not sure if this is supported by eVC but VC8 SDK lacks the tooltips control // related declarations -#if defined(__VISUALC__) && __VISUALC__ >= 1400 +#if wxCHECK_VISUALC_VERSION(8) #undef wxUSE_TOOLTIPS #define wxUSE_TOOLTIPS 0 #endif -- 2.47.2