routing native events first to the wx class and only if skipped call native handler

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

diff --git a/include/wx/event.h b/include/wx/event.h
index a4d22914f7f648a6f2436118bdcc266dd441153d..369c0b9da975b82b78de9a3e9fe6606f34d57512 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -94,6 +94,11 @@ typedef int wxEventType;
 // generate a new unique event type
 extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
 
+// FIXME: currently the new events code is disabled because it creates too
+//        many problems, it should be reenabled a.s.a.p. or removed
+#undef wxEVENTS_COMPATIBILITY_2_8
+#define wxEVENTS_COMPATIBILITY_2_8 1
+
 // macros to create an event type depending on whether type safe events are
 // enabled.
 
@@ -105,10 +110,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 +249,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);
 }