test whether wxHAS_EVENT_BIND is supported in wx/features.h itself, not wx/chkconf...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/features.h b/include/wx/features.h
index ed27473c6f468a53a5ab11014e3cfe12b5c6ebdf..62df285ff97630698bbe06fdbe3c35659ac339b2 100644 (file)
--- 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 db029d3d0ef4e206ad9de972ff78e430cba46918..b62f30c5c15a3fb2689a01f25421cfb1307835c7 100644 (file)
--- 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_ */