]> git.saurik.com Git - wxWidgets.git/commitdiff
compilation fix for wxEVENTS_COMPATIBILITY_2_8 build after r60212
authorVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Apr 2009 22:41:52 +0000 (22:41 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Thu, 16 Apr 2009 22:41:52 +0000 (22:41 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60214 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/event.h

index 622a44a973788cec2298683adb719cfd1494b9df..98f0416059579ab428b5a2bbe5d279a540712a7a 100644 (file)
@@ -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,