From e1614128e132f412403df5da044962040d15d45d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 Apr 2009 22:41:52 +0000 Subject: [PATCH] compilation fix for wxEVENTS_COMPATIBILITY_2_8 build after r60212 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/event.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/wx/event.h b/include/wx/event.h index 622a44a973..98f0416059 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -258,17 +258,23 @@ private: #if wxEVENTS_COMPATIBILITY_2_8 -// Create a functor for the legacy events: handler can be NULL and its default -// value is used by the event table macros - +// Create a functor for the legacy events: used by Connect() inline wxObjectEventFunctor * wxNewEventFunctor(const wxEventType& WXUNUSED(evtType), wxObjectEventFunction method, - wxEvtHandler *handler = NULL) + wxEvtHandler *handler) { return new wxObjectEventFunctor(method, handler); } +// This version is used by DECLARE_EVENT_TABLE_ENTRY() +inline wxObjectEventFunctor * +wxNewEventFunctor(const wxEventType& WXUNUSED(evtType), + wxObjectEventFunction method) +{ + return new wxObjectEventFunctor(method, NULL); +} + inline wxObjectEventFunctor wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType), wxObjectEventFunction method,