From 6e12b56f5e2b5e1324d263bae6e8f404faae9e98 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 3 May 2009 07:44:44 +0000 Subject: [PATCH] test whether wxHAS_EVENT_BIND is supported in wx/features.h itself, not wx/chkconf.h as the former is included after the latter and so the check was done too early and wxHAS_EVENT_BIND was always defined git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/features.h | 8 +++++--- include/wx/msw/chkconf.h | 10 ---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/include/wx/features.h b/include/wx/features.h index ed27473c6f..62df285ff9 100644 --- a/include/wx/features.h +++ b/include/wx/features.h @@ -102,10 +102,12 @@ /* If this is defined, wxEvtHandler::Bind<>() is available (not all compilers have the required template support for this and in particular under Windows - where only g++ and MSVC >= 7 currently support it, for the others it will be - undefined in wx/chkconf.h). + where only g++ and MSVC >= 7 currently support it. */ -#define wxHAS_EVENT_BIND +#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7) + #define wxHAS_EVENT_BIND +#endif + #endif /* _WX_FEATURES_H_ */ diff --git a/include/wx/msw/chkconf.h b/include/wx/msw/chkconf.h index db029d3d0e..b62f30c5c1 100644 --- a/include/wx/msw/chkconf.h +++ b/include/wx/msw/chkconf.h @@ -411,14 +411,4 @@ # define wxUSE_POSTSCRIPT 1 #endif -/* - 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 - #endif /* _WX_MSW_CHKCONF_H_ */ -- 2.45.2