common event code

[wxWidgets.git] / include / wx / event.h

diff --git a/include/wx/event.h b/include/wx/event.h
index a4d22914f7f648a6f2436118bdcc266dd441153d..fd6866ee584449e4b3a81f93fbaf8a43d4c003ab 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -105,10 +105,10 @@ extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
         extern const expdecl wxEventType name;
 
     #define wxDEFINE_EVENT_REFERENCE( name, type, value ) \
-        const wxEventType &name( value );
+        const wxEventType& name = value;
 
     #define wxDECLARE_EXPORTED_EVENT_REFERENCE( expdecl, name, type ) \
-        extern const expdecl wxEventType &name;
+        extern const expdecl wxEventType& name;
 
     #define wxDECLARE_LOCAL_EVENT( name, type ) \
         wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
@@ -244,12 +244,13 @@ private:
     wxObjectEventFunction m_method;
 };
 
-// Create a functor for the legacy events: handler can be NULL 
+// Create a functor for the legacy events: handler can be NULL and its default
+// value is used by the event table macros
 
 inline wxObjectEventFunctor *
 wxNewEventFunctor(wxEventType WXUNUSED(evtType),
                   wxObjectEventFunction method,
-                  wxEvtHandler *handler)
+                  wxEvtHandler *handler = NULL)
 {
     return new wxObjectEventFunctor(method, handler);
 }