Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-05-03 07:44:44 +00:00
parent 54a9471afb
commit 6e12b56f5e
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/features.h
View File

@@ -102,10 +102,12 @@
/* /*
If this is defined, wxEvtHandler::Bind<>() is available (not all compilers If this is defined, wxEvtHandler::Bind<>() is available (not all compilers
have the required template support for this and in particular under Windows 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 where only g++ and MSVC >= 7 currently support it.
undefined in wx/chkconf.h).
*/ */
#if wxCHECK_GCC_VERSION(3, 2) || wxCHECK_VISUALC_VERSION(7)
#define wxHAS_EVENT_BIND #define wxHAS_EVENT_BIND
#endif
#endif /* _WX_FEATURES_H_ */ #endif /* _WX_FEATURES_H_ */

10
include/wx/msw/chkconf.h
View File

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