streamlining code

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

diff --git a/include/wx/event.h b/include/wx/event.h
index 369c0b9da975b82b78de9a3e9fe6606f34d57512..cc363146e4051f840de527e51cf3f99ad39210a3 100644 (file)
--- a/include/wx/event.h
+++ b/include/wx/event.h
@@ -27,6 +27,10 @@
 #include "wx/thread.h"
 #include "wx/tracker.h"
 
 #include "wx/thread.h"
 #include "wx/tracker.h"
 

+#if !wxEVENTS_COMPATIBILITY_2_8
+    #include "wx/meta/convertible.h"
+#endif
+

 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------


@@ -69,7 +73,8 @@ typedef int wxEventType;
 #define wxEVT_ANY           ((wxEventType)-1)
 
 // this is used to make the event table entry type safe, so that for an event
 #define wxEVT_ANY           ((wxEventType)-1)
 
 // this is used to make the event table entry type safe, so that for an event

-// handler only a function with proper parameter list can be given.
+// handler only a function with proper parameter list can be given. See also
+// the wxEVENT_HANDLER_CAST-macro.

 #define wxStaticCastEvent(type, val) static_cast<type>(val)
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \
 #define wxStaticCastEvent(type, val) static_cast<type>(val)
 
 #define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \


@@ -94,93 +99,89 @@ typedef int wxEventType;
 // generate a new unique event type
 extern WXDLLIMPEXP_BASE wxEventType wxNewEventType();
 
 // 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.
+// New macros to create templatized event types:

 
 #if wxEVENTS_COMPATIBILITY_2_8
 
 #if wxEVENTS_COMPATIBILITY_2_8

+
+    // Define/Declare a wxEventType-based event type:
+

     #define wxDEFINE_EVENT( name, type ) \
     #define wxDEFINE_EVENT( name, type ) \

-        const wxEventType name( wxNewEventType() );
+        const wxEventType name( wxNewEventType() )

 
     #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
 
     #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \

-        extern const expdecl wxEventType name;
+        extern const expdecl wxEventType name
+
+    // Define/Declare a wxEventType-based event type and initialize it with a
+    // predefined event type. (Only used for wxEVT_SPIN_XXX for backward
+    // compatibility)
+
+    #define wxDEFINE_EVENT_ALIAS( name, type, value ) \
+        const wxEventType name = value

 
 

-    #define wxDEFINE_EVENT_REFERENCE( name, type, value ) \
-        const wxEventType& name = value;
+    #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
+        extern const expdecl wxEventType name

 
 

-    #define wxDECLARE_EXPORTED_EVENT_REFERENCE( expdecl, name, type ) \
-        extern const expdecl wxEventType& name;
+    // Declare a local (not exported) wxEventType-based event type:

 
 

-    #define wxDECLARE_LOCAL_EVENT( name, type ) \
-        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
+    #define wxDECLARE_EVENT( name, type ) \
+        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type );

 
 

-    #define wxEVENT_HANDLER_CAST( functype, func ) \
-        ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func )

 #else
 #else

+    // Define/Declare a templatized event type with the corresponding event as
+    // a nested typedef:
+

     #define wxDEFINE_EVENT( name, type ) \
     #define wxDEFINE_EVENT( name, type ) \

-        const wxTypedEventType< type > name( wxNewEventType() );
+        const wxEventTypeTag< type > name( wxNewEventType() )

 
     #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \
 
     #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \

-        extern const expdecl wxTypedEventType< type > name;
+        extern const expdecl wxEventTypeTag< type > name

 
 

-    #define wxDEFINE_EVENT_REFERENCE( name, type, value ) \
-        const wxTypedEventTypeReference< type > name( value );
+    // Define/Declare a templatized event type and initialize it with a
+    // predefined event type. (Only used for wxEVT_SPIN_XXX for backward
+    // compatibility)

 
 

-    #define wxDECLARE_EXPORTED_EVENT_REFERENCE( expdecl, name, type ) \
-        extern const expdecl wxTypedEventTypeReference< type > name;
+    #define wxDEFINE_EVENT_ALIAS( name, type, value ) \
+        const wxEventTypeTag< type > name( value )

 
 

-    #define wxDECLARE_LOCAL_EVENT( name, type ) \
-        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type )
+    #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \
+        extern const expdecl wxEventTypeTag< type > name

 
 

-    #define wxEVENT_HANDLER_CAST( functype, func ) \
-        ( &func )
-#endif
+    // Declare a local (not exported) templatized event type:

 
 

-// template which associates the correct event object with the event type
+    #define wxDECLARE_EVENT( name, type ) \
+        wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type );

 
 

-#if !wxEVENTS_COMPATIBILITY_2_8
+#endif

 
 

-template <typename Event>
-class WXDLLIMPEXP_BASE wxTypedEventType
-{
-public:
-    typedef Event CorrespondingEvent;
+// Try to cast the given event handler to the correct handler type:

 
 

-    wxTypedEventType(wxEventType type) { m_type = type; }
+#define wxEVENT_HANDLER_CAST( functype, func ) \
+    ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func )

 
 

-    // used for static event tables
-    operator const wxEventType&() const { return m_type; }
+// Template which associates the correct event object with the event type

 
 

-private:
-    wxEventType m_type;
-};
+#if !wxEVENTS_COMPATIBILITY_2_8

 
 

-// Due to a bug in older wx versions wxSpinEvents were being sent with type of
-// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
-// with the type-safe events in place, these event types are associated with
-// wxScrollEvent. To allow handling of spin events, new event types have been
-// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
-// the spin event types are being initialized with the scroll event types. But
-// this presents as with the same static initialization order problem we also
-// have for the static event tables. So we use the same solution and the
-// template definition below holds a reference to a wxEventType.
-template <typename Event>
-class WXDLLIMPEXP_BASE wxTypedEventTypeReference
+// The tag is a type associated to the event type (which is an integer itself,
+// in spite of its name) value. It exists in order to be used as a template
+// parameter and provide a mapping between the event type values and their
+// corresponding wxEvent-derived classes.
+template <typename T>
+class wxEventTypeTag

 {
 public:
 {
 public:

-    typedef Event CorrespondingEvent;
+    // The class of wxEvent-derived class carried by the events of this type.
+    typedef T EventClass;

 
 

-    wxTypedEventTypeReference(const wxEventType& type) : m_type(type) { }
+    wxEventTypeTag(wxEventType type) { m_type = type; }

 
 

-    // used for static event tables
+    // Return a wxEventType reference for the initialization of the static
+    // event tables. See wxEventTableEntry::m_eventType for a more thorough
+    // explanation.

     operator const wxEventType&() const { return m_type; }
 
 private:
     operator const wxEventType&() const { return m_type; }
 
 private:

-    const wxEventType &m_type;
+    wxEventType m_type;

 };
 
 #endif // !wxEVENTS_COMPATIBILITY_2_8
 };
 
 #endif // !wxEVENTS_COMPATIBILITY_2_8


@@ -198,25 +199,31 @@ typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&);
 typedef wxEventFunction wxObjectEventFunction;
 
 
 typedef wxEventFunction wxObjectEventFunction;
 
 

-// the functors which will be stored in the static/dynamic tables
+// The event functor which is stored in the static and dynamic event tables:

 class WXDLLIMPEXP_BASE wxEventFunctor
 {
 public:
     virtual ~wxEventFunctor();
 
 class WXDLLIMPEXP_BASE wxEventFunctor
 {
 public:
     virtual ~wxEventFunctor();
 

-    // this operator is used to actually invoke the event handler
-    virtual void operator()(wxEvtHandler *, wxEvent &) = 0;
+    // Invoke the actual event handler:
+    virtual void operator()(wxEvtHandler *, wxEvent&) = 0;

 
     // this function tests whether this functor is matched, for the purpose of
     // finding it in an event table in Disconnect(), by the given func
     virtual bool Matches(const wxEventFunctor& func) const = 0;
 
 
     // this function tests whether this functor is matched, for the purpose of
     // finding it in an event table in Disconnect(), by the given func
     virtual bool Matches(const wxEventFunctor& func) const = 0;
 

-    virtual wxEvtHandler *GetHandler() const { return NULL; }
+    // these functions are used for functors comparison in Matches()
+    virtual void *GetHandler() const { return GetEvtHandler(); }
+    virtual wxEventFunction GetMethod() const { return NULL; }

 
 

-    virtual wxObjectEventFunction GetMethod() const { return NULL; }
+    // this one is also used elsewhere in the code and should be overridden to
+    // return non-NULL if we are indeed associated with an wxEvtHandler
+    virtual wxEvtHandler *GetEvtHandler() const { return NULL; }

 };
 
 };
 

-// A plain method functor
+// A plain method functor: notice that it is used even with the new events as
+// it is reused as a specialization of wxEventFunctorMethod for legacy untyped
+// event types

 class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor
 {
 public:
 class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor
 {
 public:


@@ -226,34 +233,36 @@ public:
         m_method = method;
     }
 
         m_method = method;
     }
 

-    virtual void operator()(wxEvtHandler *handler, wxEvent& event)
-    {
-        wxEvtHandler * const realHandler = m_handler ? m_handler : handler;
-
-        (realHandler->*m_method)(event);
-    }
+    virtual void operator()(wxEvtHandler *handler, wxEvent& event);

 
 

-    virtual bool Matches(const wxEventFunctor& other) const
+    virtual bool Matches(const wxEventFunctor& func) const

     {
     {

-        wxEvtHandler * const handler = other.GetHandler();
+        void * const handler = func.GetHandler();
+        if ( handler && GetHandler() != handler )
+            return false;

 
 

-        return (m_handler == handler || !handler) &&
-               (m_method == other.GetMethod());
+        const wxEventFunction method = GetMethod();
+
+        // FIXME-VC6: amazing but true: replacing "method == NULL" here with
+        //            "!method" makes VC6 crash with an ICE in DLL build (only!)
+        return method == NULL || GetMethod() == method;

     }
 
     }
 

-    virtual wxEvtHandler *GetHandler() const { return m_handler; }
-    virtual wxObjectEventFunction GetMethod() const { return m_method; }
+    virtual wxEvtHandler *GetEvtHandler() const { return m_handler; }
+    virtual wxEventFunction GetMethod() const { return m_method; }

 
 private:
     wxEvtHandler *m_handler;
 
 private:
     wxEvtHandler *m_handler;

-    wxObjectEventFunction m_method;
+    wxEventFunction m_method;

 };
 
 };
 

+#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
 
 inline wxObjectEventFunctor *
 // 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),
+wxNewEventFunctor(const wxEventType& WXUNUSED(evtType),

                   wxObjectEventFunction method,
                   wxEvtHandler *handler = NULL)
 {
                   wxObjectEventFunction method,
                   wxEvtHandler *handler = NULL)
 {


@@ -261,224 +270,265 @@ wxNewEventFunctor(wxEventType WXUNUSED(evtType),
 }
 
 inline wxObjectEventFunctor
 }
 
 inline wxObjectEventFunctor

-wxConstructEventFunctor(wxEventType WXUNUSED(evtType),
+wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType),

                         wxObjectEventFunction method,
                         wxEvtHandler *handler)
 {
     return wxObjectEventFunctor(method, handler);
 }
 
                         wxObjectEventFunction method,
                         wxEvtHandler *handler)
 {
     return wxObjectEventFunctor(method, handler);
 }
 

-#if !wxEVENTS_COMPATIBILITY_2_8
+#else // !wxEVENTS_COMPATIBILITY_2_8

 
 

-template <typename EventType>
-class WXDLLIMPEXP_BASE wxEventFunctorFunction : public wxEventFunctor
+// functor forwarding the event to anything callable (function, static method,
+// generalized functor...)
+template <typename EventTag, typename Functor>
+class wxEventFunctorFunction : public wxEventFunctor

 {
 public:
 {
 public:

-    wxEventFunctorFunction(void (*handler)(typename EventType::CorrespondingEvent &))
+    typedef typename EventTag::EventClass EventArg;
+
+    wxEventFunctorFunction(Functor handler)

     {
         m_handler = handler;
     }
 
     virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
     {
     {
         m_handler = handler;
     }
 
     virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event)
     {

-        // Protect against wrong event i.e. wxMouseEvent evt(wxEVT_PAINT):
-        wxASSERT( dynamic_cast< typename EventType::CorrespondingEvent * >( &event ) != NULL );
-
-        // Will throw a std::bad_cast exception in release build:
-        ( *m_handler )( dynamic_cast< typename EventType::CorrespondingEvent & >( event ));
+        m_handler(static_cast<EventArg&>(event));

     }
 
     }
 

-    virtual bool Matches( const wxEventFunctor &right ) const
+    virtual bool Matches(const wxEventFunctor& WXUNUSED(func)) const

     {
     {

-        wxEventFunctorFunction const &other = dynamic_cast< wxEventFunctorFunction const & >( right );
-
-        return m_handler == other.m_handler || other.m_handler == NULL;
+        // we have no way to compare arbitrary functors so just consider them
+        // to be equal: this means that disconnecting a functor will always
+        // find the last functor connected which in turn implies that it's
+        // probably a bad idea to connect more than one functor if you plan to
+        // disconnect them but this limitation doesn't seem very important in
+        // practice
+        return true;

     }
 
 private:
     }
 
 private:

-    void ( *m_handler )( typename EventType::CorrespondingEvent & );
+    Functor m_handler;
+};
+
+namespace wxPrivate
+{
+
+// helper template defining nested "type" typedef as the event class
+// corresponding to the given event type
+template <typename T> struct EventClassOf;
+
+// the typed events provide the information about the class of the events they
+// carry themselves:
+template <typename T>
+struct EventClassOf< wxEventTypeTag<T> >
+{
+    typedef typename wxEventTypeTag<T>::EventClass type;
+};
+
+// for the old untyped events we don't have information about the exact event
+// class carried by them
+template <>
+struct EventClassOf<wxEventType>
+{
+    typedef wxEvent type;
+};
+
+
+// helper class defining operations different for method functors using an
+// object of wxEvtHandler-derived class as handler and the others
+template <typename T, typename A, bool> struct HandlerImpl;
+
+// specialization for handlers deriving from wxEvtHandler
+template <typename T, typename A>
+struct HandlerImpl<T, A, true>
+{
+    static bool IsEvtHandler()
+        { return true; }
+    static T *ConvertFromEvtHandler(wxEvtHandler *p)
+        { return static_cast<T *>(p); }
+    static wxEvtHandler *ConvertToEvtHandler(T *p)
+        { return p; }
+    static wxEventFunction ConvertToEvtFunction(void (T::*f)(A&))
+        { return static_cast<wxEventFunction>(
+                    reinterpret_cast<void (T::*)(wxEvent&)>(f)); }
+};
+
+// specialization for handlers not deriving from wxEvtHandler
+template <typename T, typename A>
+struct HandlerImpl<T, A, false>
+{
+    static bool IsEvtHandler()
+        { return false; }
+    static T *ConvertFromEvtHandler(wxEvtHandler *)
+        { return NULL; }
+    static wxEvtHandler *ConvertToEvtHandler(T *)
+        { return NULL; }
+    static wxEventFunction ConvertToEvtFunction(void (T::*)(A&))
+        { return NULL; }

 };
 
 };
 

+} // namespace wxPrivate

 
 

-template <typename EventType, typename Class, typename Derived>
-class WXDLLIMPEXP_BASE wxEventFunctorMethod : public wxEventFunctor
+// functor forwarding the event to a method of the given object
+//
+// notice that the object class may be different from the class in which the
+// method is defined but it must be convertible to this class
+//
+// also, the type of the handler parameter doesn't need to be exactly the same
+// as EventTag::EventClass but it must be its base class -- this is explicitly
+// allowed to handle different events in the same handler taking wxEvent&, for
+// example
+template
+  <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+class wxEventFunctorMethod
+    : public wxEventFunctor,
+      private wxPrivate::HandlerImpl
+              <
+                Class,
+                EventArg,
+                wxConvertibleTo<Class, wxEvtHandler>::value != 0
+              >

 {
 {

+private:
+    static void CheckHandlerArgument(EventArg *) { }
+

 public:
 public:

-    wxEventFunctorMethod( void ( Class::*method )( typename EventType::CorrespondingEvent & ),
-            Derived *handler )
+    // the event class associated with the given event tag
+    typedef typename wxPrivate::EventClassOf<EventTag>::type EventClass;
+
+
+    wxEventFunctorMethod(void (Class::*method)(EventArg&), EventHandler *handler)

     {
     {

+        wxASSERT_MSG( handler || this->IsEvtHandler(),
+                      "handlers defined in non-wxEvtHandler-derived classes "
+                      "must be connected with a valid sink object" );
+
+        // if you get an error here it means that the signature of the handler
+        // you're trying to use is not compatible with (i.e. is not the same as
+        // or a base class of) the real event class used for this event type
+        CheckHandlerArgument(static_cast<EventClass *>(NULL));
+

         m_handler = handler;
         m_method =  method;
     }
 
         m_handler = handler;
         m_method =  method;
     }
 

-    virtual void operator () ( wxEvtHandler *handler, wxEvent &event )
+    virtual void operator()(wxEvtHandler *handler, wxEvent& event)

     {
     {

-        // Compile-time type check 1: This requires Derived to derive from or
-        // be of the same type as Class
-        Class *realHandler = m_handler;
-
-        if( m_handler == NULL )
+        Class * realHandler = m_handler;
+        if ( !realHandler )

         {
         {

-            // Verify that the handler does indeed derive from the class
-            // containing the handler method
-            wxASSERT( dynamic_cast< Class * >( handler) != NULL );
+            realHandler = this->ConvertFromEvtHandler(handler);

 
 

-            realHandler = dynamic_cast< Class * >( handler );
+            // this is not supposed to happen but check for it nevertheless
+            wxCHECK_RET( realHandler, "invalid event handler" );

         }
 
         }
 

-        // Protect against wrong event i.e. wxMouseEvent evt(wxEVT_PAINT):
-        wxASSERT( dynamic_cast< typename EventType::CorrespondingEvent * >( &event ) != NULL );
-
-        // Will throw a std::bad_cast exception in release build:
-        ( realHandler->*m_method )( dynamic_cast< typename EventType::CorrespondingEvent & >( event ));
+        // the real (run-time) type of event is EventClass and we checked in
+        // the ctor that EventClass can be converted to EventArg, so this cast
+        // is always valid
+        (realHandler->*m_method)(static_cast<EventArg&>(event));

     }
 
     }
 

-    virtual bool Matches( const wxEventFunctor &right ) const
+    virtual bool Matches(const wxEventFunctor& func) const

     {
     {

-        wxEventFunctorMethod const &other = dynamic_cast< wxEventFunctorMethod const & >( right );
+        void * const handler = func.GetHandler();
+        if ( handler && GetHandler() != handler )
+            return false;

 
 

-        return (( m_handler == other.m_handler || other.m_handler == NULL ) &&
-                ( m_method == other.m_method || other.m_method == NULL ));
+        const wxEventFunction method = GetMethod();
+        return !method || GetMethod() == method;

     }
 
     }
 

-    virtual wxEvtHandler *GetHandler() const
+    virtual void *GetHandler() const

     {
     {

-        // This makes sure Derived derives from wxEvtHandler (it is still
-        // possible and even ok if Class does not derive from wxEvtHandler. In
-        // this case Derived would end up using multiple inheritance: class
-        // Derived : public wxEvtHandler, public Class { } where Class contains
-        // the method to call, but wxEvtHandler contains the wxTrackable and
-        // code for weak ref support

         return m_handler;
     }
 
         return m_handler;
     }
 

-    virtual wxObjectEventFunction GetMethod() const
+    virtual wxEventFunction GetMethod() const

     {
     {

-        return reinterpret_cast<wxObjectEventFunction>(m_method);
+        return this->ConvertToEvtFunction(m_method);

     }
 
     }
 

-private:
-    Derived *m_handler;
-    void (Class::*m_method)(typename EventType::CorrespondingEvent&);
-};
-
-
-template <typename EventType, typename Functor>
-class WXDLLIMPEXP_BASE wxEventFunctorAdapter : public wxEventFunctor
-{
-public:
-    wxEventFunctorAdapter( Functor &functor )
+    virtual wxEvtHandler *GetEvtHandler() const

     {
     {

-        m_functor = functor;
-    }
-
-    virtual void operator () ( wxEvtHandler *WXUNUSED( handler ), wxEvent &event )
-    {
-        // Protect against wrong event i.e. wxMouseEvent evt(wxEVT_PAINT):
-        wxASSERT( dynamic_cast< typename EventType::CorrespondingEvent * >( &event ) != NULL );
-
-        // Will throw a std::bad_cast exception in release build:
-        m_functor( dynamic_cast< typename EventType::CorrespondingEvent & >( event ));
-    }
-
-    virtual bool Matches( const wxEventFunctor &right ) const
-    {
-        wxEventFunctorAdapter const &other = dynamic_cast< wxEventFunctorAdapter const & >( right );
-
-        return m_functor == other.m_functor;
+        return this->ConvertToEvtHandler(m_handler);

     }
 
 private:
     }
 
 private:

-    Functor m_functor;
+    EventHandler *m_handler;
+    void (Class::*m_method)(EventArg&);

 };
 
 };
 

-//
-// Create functors for the templatized events (needed in wxEvtHandler::Connect):
-//

 
 

-// Create a functor for functions:
-
-template <typename EventType>
-inline wxEventFunctorFunction<EventType> *
-wxNewEventFunctor(const EventType &,
-                  void (*function)(typename EventType::CorrespondingEvent&))
-{
-    return new wxEventFunctorFunction<EventType>(function);
-}
+// Create functors for the templatized events, either allocated on the heap for
+// wxNewXXX() variants (this is needed in wxEvtHandler::Bind<>() to store them
+// in dynamic event table) or just by returning them as temporary objects (this
+// is enough for Unbind<>() and we avoid unnecessary heap allocation like this).

 
 

-// Create a functor for methods:

 
 

-template <typename EventType, typename Class>
-inline wxEventFunctorMethod<EventType, Class, Class> *
-wxNewEventFunctor(const EventType &,
-                  void (Class::*method)(typename EventType::CorrespondingEvent&))
+// Create functors wrapping other functors (including functions):
+template <typename EventTag, typename Functor>
+inline wxEventFunctorFunction<EventTag, Functor> *
+wxNewEventFunctor(const EventTag&, Functor func)

 {
 {

-    return new wxEventFunctorMethod<EventType, Class, Class>(method, NULL);
+    return new wxEventFunctorFunction<EventTag, Functor>(func);

 }
 
 }
 

-template <typename EventType, typename Class, typename Derived>
-inline wxEventFunctorMethod<EventType, Class, Derived> *
-wxNewEventFunctor(const EventType &,
-                  void (Class::*method)(typename EventType::CorrespondingEvent &),
-                  Derived *handler )
+template <typename EventTag, typename Functor>
+inline wxEventFunctorFunction<EventTag, Functor>
+wxMakeEventFunctor(const EventTag&, Functor func)

 {
 {

-    return new wxEventFunctorMethod<EventType, Class, Derived>(method, handler);
+    return wxEventFunctorFunction<EventTag, Functor>(func);

 }
 
 }
 

-// Create a functor for arbitrary functors (like boost::function):
-template <typename EventType, typename Functor>
-inline wxEventFunctorAdapter<EventType, Functor> *
-wxNewEventFunctor(const EventType &,
-                  Functor& functor )
-{
-    return new wxEventFunctorAdapter<EventType, Functor>(functor);
-}

 
 

-//
-// Construct functors for the templatized events (needed in wxEvtHandler::Disconnect):
-//
-
-// Construct a functor for functions:
-
-template <typename EventType>
-inline wxEventFunctorFunction<EventType>
-wxConstructEventFunctor(const EventType &,
-                        void (*function)(typename EventType::CorrespondingEvent&))
+// Create functors for methods:
+template
+  <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+inline wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler> *
+wxNewEventFunctor(const EventTag&,
+                  void (Class::*method)(EventArg&),
+                  EventHandler *handler)

 {
 {

-    return wxEventFunctorFunction<EventType>(function);
+    return new wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>(
+                method, handler);

 }
 
 }
 

-// Construct a functor for methods:
-
-template <typename EventType, typename Class>
-inline wxEventFunctorMethod<EventType, Class, Class>
-wxConstructEventFunctor(const EventType &,
-                        void (Class::*method)(typename EventType::CorrespondingEvent&))
+template
+    <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+inline wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>
+wxMakeEventFunctor(const EventTag&,
+                   void (Class::*method)(EventArg&),
+                   EventHandler *handler)

 {
 {

-    return wxEventFunctorMethod<EventType, Class, Class>(method, NULL);
+    return wxEventFunctorMethod<EventTag, Class, EventArg, EventHandler>(
+                method, handler);

 }
 
 }
 

-template <typename EventType, typename Class, typename Derived>
-inline wxEventFunctorMethod<EventType, Class, Derived>
-wxConstructEventFunctor(const EventType &,
-                        void (Class::*method)(typename EventType::CorrespondingEvent&),
-                        Derived *handler)
+// Special case for the wxNewEventFunctor() calls used inside the event table
+// macros: they don't specify the handler so EventHandler can't be deduced
+template <typename EventTag, typename Class, typename EventArg>
+inline wxEventFunctorMethod<EventTag, Class, EventArg, Class> *
+wxNewEventFunctor(const EventTag&, void (Class::*method)(EventArg&))

 {
 {

-    return wxEventFunctorMethod<EventType, Class, Derived>(method, handler);
+    return new wxEventFunctorMethod<EventTag, Class, EventArg, Class>(
+                    method, NULL);

 }
 
 }
 

-// Construct a functor for arbitrary functors (like boost:function):
-
-template <typename EventType, typename Functor>
-inline wxEventFunctorAdapter<EventType, Functor>
-wxConstructEventFunctor(const EventType &,
-                        Functor& functor)
+template
+    <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+inline wxEventFunctorMethod<EventTag, Class, EventArg, Class>
+wxMakeEventFunctor(const EventTag&, void (Class::*method)(EventArg&))

 {
 {

-    return wxEventFunctorAdapter<EventType, Functor>(functor);
+    return wxEventFunctorMethod<EventTag, Class, EventArg, Class>(
+                method, NULL);

 }
 
 #endif // !wxEVENTS_COMPATIBILITY_2_8
 
 }
 
 #endif // !wxEVENTS_COMPATIBILITY_2_8
 

+

 // many, but not all, standard event types
 
     // some generic events
 // many, but not all, standard event types
 
     // some generic events


@@ -488,6 +538,7 @@ extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST;
 
     // Need events declared to do this
 class WXDLLIMPEXP_FWD_CORE wxCommandEvent;
 
     // Need events declared to do this
 class WXDLLIMPEXP_FWD_CORE wxCommandEvent;

+class WXDLLIMPEXP_FWD_CORE wxThreadEvent;

 class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
 class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
 class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent;
 class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
 class WXDLLIMPEXP_FWD_CORE wxFocusEvent;
 class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent;


@@ -495,6 +546,7 @@ class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent;
 class WXDLLIMPEXP_FWD_CORE wxScrollEvent;
 class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent;
 class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent;
 class WXDLLIMPEXP_FWD_CORE wxScrollEvent;

+class WXDLLIMPEXP_FWD_CORE wxSpinEvent;

 class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent;
 class WXDLLIMPEXP_FWD_CORE wxSizeEvent;
 class WXDLLIMPEXP_FWD_CORE wxMoveEvent;
 class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent;
 class WXDLLIMPEXP_FWD_CORE wxSizeEvent;
 class WXDLLIMPEXP_FWD_CORE wxMoveEvent;


@@ -526,140 +578,160 @@ class WXDLLIMPEXP_FWD_CORE wxHelpEvent;
 
 
     // Command events
 
 
     // Command events

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SLIDER_UPDATED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEvent);

 
 // wxEVT_COMMAND_SCROLLBAR_UPDATED is deprecated, use wxEVT_SCROLL... events
 
 // wxEVT_COMMAND_SCROLLBAR_UPDATED is deprecated, use wxEVT_SCROLL... events

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SCROLLBAR_UPDATED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_VLBOX_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_RCLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TOOL_ENTER, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_COMBOBOX_CLOSEUP, wxCommandEvent);
+
+    // Thread events
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_THREAD, wxThreadEvent);

 
     // Mouse event types
 
     // Mouse event types

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_UP, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DOWN, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_UP, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DOWN, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_UP, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOTION, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ENTER_WINDOW, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEAVE_WINDOW, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DCLICK, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DCLICK, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DCLICK, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_FOCUS, wxFocusEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KILL_FOCUS, wxFocusEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHILD_FOCUS, wxChildFocusEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSEWHEEL, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DOWN, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_UP, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DCLICK, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_UP, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DOWN, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_UP, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DOWN, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_UP, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOTION, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ENTER_WINDOW, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEAVE_WINDOW, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DCLICK, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DCLICK, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DCLICK, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_FOCUS, wxFocusEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KILL_FOCUS, wxFocusEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHILD_FOCUS, wxChildFocusEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSEWHEEL, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DOWN, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_UP, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DCLICK, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent);

 
     // Character input event type
 
     // Character input event type

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR_HOOK, wxKeyEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_DOWN, wxKeyEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR_HOOK, wxKeyEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_DOWN, wxKeyEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent);

 #if wxUSE_HOTKEY
 #if wxUSE_HOTKEY

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent);

 #endif
     // Set cursor event
 #endif
     // Set cursor event

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent);

 
     // wxScrollBar and wxSlider event identifiers
 
     // wxScrollBar and wxSlider event identifiers

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_TOP, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_BOTTOM, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEUP, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEDOWN, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEUP, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEDOWN, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_TOP, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_BOTTOM, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEUP, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEDOWN, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEUP, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEDOWN, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent);
+
+// Due to a bug in older wx versions, wxSpinEvents were being sent with type of
+// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But
+// with the type-safe events in place, these event types are associated with
+// wxScrollEvent. To allow handling of spin events, new event types have been
+// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility
+// the spin event types are being initialized with the scroll event types.
+
+#if wxUSE_SPINBTN
+
+wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP,   wxSpinEvent );
+wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent );
+wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN,      wxSpinEvent );
+
+#endif

 
     // Scroll events from wxWindow
 
     // Scroll events from wxWindow

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent);

 
     // System events
 
     // System events

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CLOSE_WINDOW, wxCloseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_END_SESSION, wxCloseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_END_SESSION, wxCloseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE_APP, wxActivateEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE, wxActivateEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CREATE, wxWindowCreateEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DESTROY, wxWindowDestroyEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SHOW, wxShowEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ICONIZE, wxIconizeEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAXIMIZE, wxMaximizeEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PAINT, wxPaintEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ERASE_BACKGROUND, wxEraseEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NC_PAINT, wxNcPaintEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_OPEN, wxMenuEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_CLOSE, wxMenuEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_HIGHLIGHT, wxMenuEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CONTEXT_MENU, wxContextMenuEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_UP, wxJoystickEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_MOVE, wxJoystickEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_ZMOVE, wxJoystickEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DROP_FILES, wxDropFilesEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_INIT_DIALOG, wxInitDialogEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_IDLE, wxIdleEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_UPDATE_UI, wxUpdateUIEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZING, wxSizeEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVING, wxMoveEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_START, wxMoveEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CLOSE_WINDOW, wxCloseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_END_SESSION, wxCloseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_END_SESSION, wxCloseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE_APP, wxActivateEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE, wxActivateEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CREATE, wxWindowCreateEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DESTROY, wxWindowDestroyEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SHOW, wxShowEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ICONIZE, wxIconizeEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAXIMIZE, wxMaximizeEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PAINT, wxPaintEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ERASE_BACKGROUND, wxEraseEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NC_PAINT, wxNcPaintEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_OPEN, wxMenuEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_CLOSE, wxMenuEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_HIGHLIGHT, wxMenuEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CONTEXT_MENU, wxContextMenuEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_UP, wxJoystickEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_MOVE, wxJoystickEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_ZMOVE, wxJoystickEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DROP_FILES, wxDropFilesEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_INIT_DIALOG, wxInitDialogEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_IDLE, wxIdleEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_UPDATE_UI, wxUpdateUIEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZING, wxSizeEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVING, wxMoveEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_START, wxMoveEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent);

 
     // Clipboard events
 
     // Clipboard events

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_COPY, wxClipboardTextEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_CUT, wxClipboardTextEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_PASTE, wxClipboardTextEvent);

 
     // Generic command events
     // Note: a click is a higher-level event than button down/up
 
     // Generic command events
     // Note: a click is a higher-level event than button down/up

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SET_FOCUS, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_ENTER, wxCommandEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SET_FOCUS, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_ENTER, wxCommandEvent);

 
     // Help events
 
     // Help events

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent)
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent);
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent);

 
 // these 2 events are the same
 #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED
 
 // these 2 events are the same
 #define wxEVT_COMMAND_TOOL_CLICKED wxEVT_COMMAND_MENU_SELECTED


@@ -672,11 +744,16 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent)
 // wx/textctrl.h in all ports [yet], so declare it here as well
 //
 // still, any new code using it should include wx/textctrl.h explicitly
 // wx/textctrl.h in all ports [yet], so declare it here as well
 //
 // still, any new code using it should include wx/textctrl.h explicitly

-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent)
+wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEvent);
+
+
+// ----------------------------------------------------------------------------
+// wxEvent(-derived) classes
+// ----------------------------------------------------------------------------

 
 // the predefined constants for the number of times we propagate event
 // upwards window child-parent chain
 
 // the predefined constants for the number of times we propagate event
 // upwards window child-parent chain

-enum Propagation_state
+enum wxEventPropagation

 {
     // don't propagate it at all
     wxEVENT_PROPAGATE_NONE = 0,
 {
     // don't propagate it at all
     wxEVENT_PROPAGATE_NONE = 0,


@@ -685,6 +762,59 @@ enum Propagation_state
     wxEVENT_PROPAGATE_MAX = INT_MAX
 };
 
     wxEVENT_PROPAGATE_MAX = INT_MAX
 };
 

+// The different categories for a wxEvent; see wxEvent::GetEventCategory.
+// NOTE: they are used as OR-combinable flags by wxEventLoopBase::YieldFor
+enum wxEventCategory
+{
+    // this is the category for those events which are generated to update
+    // the appearance of the GUI but which (usually) do not comport data
+    // processing, i.e. which do not provide input or output data
+    // (e.g. size events, scroll events, etc).
+    // They are events NOT directly generated by the user's input devices.
+    wxEVT_CATEGORY_UI = 1,
+
+    // this category groups those events which are generated directly from the
+    // user through input devices like mouse and keyboard and usually result in
+    // data to be processed from the application.
+    // (e.g. mouse clicks, key presses, etc)
+    wxEVT_CATEGORY_USER_INPUT = 2,
+
+    // this category is for wxSocketEvent
+    wxEVT_CATEGORY_SOCKET = 4,
+
+    // this category is for wxTimerEvent
+    wxEVT_CATEGORY_TIMER = 8,
+
+    // this category is for any event used to send notifications from the
+    // secondary threads to the main one or in general for notifications among
+    // different threads (which may or may not be user-generated)
+    wxEVT_CATEGORY_THREAD = 16,
+
+
+    // implementation only
+
+    // used in the implementations of wxEventLoopBase::YieldFor
+    wxEVT_CATEGORY_UNKNOWN = 32,
+
+    // a special category used as an argument to wxEventLoopBase::YieldFor to indicate that
+    // Yield() should leave all wxEvents on the queue while emptying the native event queue
+    // (native events will be processed but the wxEvents they generate will be queued)
+    wxEVT_CATEGORY_CLIPBOARD = 64,
+
+
+    // shortcut masks
+
+    // this category groups those events which are emitted in response to
+    // events of the native toolkit and which typically are not-"delayable".
+    wxEVT_CATEGORY_NATIVE_EVENTS = wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT,
+
+    // used in wxEventLoopBase::YieldFor to specify all event categories should be processed:
+    wxEVT_CATEGORY_ALL =
+        wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \
+        wxEVT_CATEGORY_TIMER|wxEVT_CATEGORY_THREAD|wxEVT_CATEGORY_UNKNOWN| \
+        wxEVT_CATEGORY_CLIPBOARD
+};
+

 /*
  * wxWidgets events, covering all interesting things that might happen
  * (button clicking, resizing, setting text in widgets, etc.).
 /*
  * wxWidgets events, covering all interesting things that might happen
  * (button clicking, resizing, setting text in widgets, etc.).


@@ -704,10 +834,13 @@ public:
 
     void SetEventType(wxEventType typ) { m_eventType = typ; }
     wxEventType GetEventType() const { return m_eventType; }
 
     void SetEventType(wxEventType typ) { m_eventType = typ; }
     wxEventType GetEventType() const { return m_eventType; }

+

     wxObject *GetEventObject() const { return m_eventObject; }
     void SetEventObject(wxObject *obj) { m_eventObject = obj; }
     wxObject *GetEventObject() const { return m_eventObject; }
     void SetEventObject(wxObject *obj) { m_eventObject = obj; }

+

     long GetTimestamp() const { return m_timeStamp; }
     void SetTimestamp(long ts = 0) { m_timeStamp = ts; }
     long GetTimestamp() const { return m_timeStamp; }
     void SetTimestamp(long ts = 0) { m_timeStamp = ts; }

+

     int GetId() const { return m_id; }
     void SetId(int Id) { m_id = Id; }
 
     int GetId() const { return m_id; }
     void SetId(int Id) { m_id = Id; }
 


@@ -718,11 +851,17 @@ public:
     void Skip(bool skip = true) { m_skipped = skip; }
     bool GetSkipped() const { return m_skipped; }
 
     void Skip(bool skip = true) { m_skipped = skip; }
     bool GetSkipped() const { return m_skipped; }
 

-    // this function is used to create a copy of the event polymorphically and
+    // This function is used to create a copy of the event polymorphically and

     // all derived classes must implement it because otherwise wxPostEvent()
     // for them wouldn't work (it needs to do a copy of the event)
     virtual wxEvent *Clone() const = 0;
 
     // all derived classes must implement it because otherwise wxPostEvent()
     // for them wouldn't work (it needs to do a copy of the event)
     virtual wxEvent *Clone() const = 0;
 

+    // this function is used to selectively process events in wxEventLoopBase::YieldFor
+    // NOTE: by default it returns wxEVT_CATEGORY_UI just because the major
+    //       part of wxWidgets events belong to that category.
+    virtual wxEventCategory GetEventCategory() const
+        { return wxEVT_CATEGORY_UI; }
+

     // Implementation only: this test is explicitly anti OO and this function
     // exists only for optimization purposes.
     bool IsCommandEvent() const { return m_isCommandEvent; }
     // Implementation only: this test is explicitly anti OO and this function
     // exists only for optimization purposes.
     bool IsCommandEvent() const { return m_isCommandEvent; }


@@ -747,6 +886,20 @@ public:
         m_propagationLevel = propagationLevel;
     }
 
         m_propagationLevel = propagationLevel;
     }
 

+
+    // This is for internal use only and is only called by
+    // wxEvtHandler::ProcessEvent() to check whether it's the first time this
+    // event is being processed
+    bool WasProcessed()
+    {
+        if ( m_wasProcessed )
+            return true;
+
+        m_wasProcessed = true;
+
+        return false;
+    }
+

 protected:
     wxObject*         m_eventObject;
     wxEventType       m_eventType;
 protected:
     wxObject*         m_eventObject;
     wxEventType       m_eventType;


@@ -760,14 +913,17 @@ public:
 protected:
     // the propagation level: while it is positive, we propagate the event to
     // the parent window (if any)
 protected:
     // the propagation level: while it is positive, we propagate the event to
     // the parent window (if any)

-    //
-    // this one doesn't have to be public, we don't have to worry about
-    // backwards compatibility as it is new

     int               m_propagationLevel;
 
     bool              m_skipped;
     bool              m_isCommandEvent;
 
     int               m_propagationLevel;
 
     bool              m_skipped;
     bool              m_isCommandEvent;
 

+    // initially false but becomes true as soon as WasProcessed() is called for
+    // the first time, as this is done only by ProcessEvent() it explains the
+    // variable name: it becomes true after ProcessEvent() was called at least
+    // once for this event
+    bool m_wasProcessed;
+

 protected:
     wxEvent(const wxEvent&);            // for implementing Clone()
     wxEvent& operator=(const wxEvent&); // for derived classes operator=()
 protected:
     wxEvent(const wxEvent&);            // for implementing Clone()
     wxEvent& operator=(const wxEvent&); // for derived classes operator=()


@@ -799,7 +955,7 @@ private:
     wxEvent& m_event;
     int m_propagationLevelOld;
 
     wxEvent& m_event;
     int m_propagationLevelOld;
 

-    DECLARE_NO_COPY_CLASS(wxPropagationDisabler)
+    wxDECLARE_NO_COPY_CLASS(wxPropagationDisabler);

 };
 
 /*
 };
 
 /*


@@ -824,7 +980,7 @@ public:
 private:
     wxEvent& m_event;
 
 private:
     wxEvent& m_event;
 

-    DECLARE_NO_COPY_CLASS(wxPropagateOnce)
+    wxDECLARE_NO_COPY_CLASS(wxPropagateOnce);

 };
 
 
 };
 
 


@@ -892,6 +1048,7 @@ public:
     int GetInt() const { return m_commandInt; }
 
     virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }
     int GetInt() const { return m_commandInt; }
 
     virtual wxEvent *Clone() const { return new wxCommandEvent(*this); }

+    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }

 
 protected:
     wxString          m_cmdString;     // String event argument
 
 protected:
     wxString          m_cmdString;     // String event argument


@@ -935,6 +1092,45 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent)
 };
 

+
+// Thread event
+
+class WXDLLIMPEXP_CORE wxThreadEvent : public wxCommandEvent
+{
+public:
+    wxThreadEvent(wxEventType eventType = wxEVT_COMMAND_THREAD, int id = wxID_ANY)
+        : wxCommandEvent(eventType, id)
+        { }
+
+    wxThreadEvent(const wxThreadEvent& event)
+        : wxCommandEvent(event)
+    {
+        // make sure our string member (which uses COW, aka refcounting) is not
+        // shared by other wxString instances:
+        SetString(GetString().c_str());
+    }
+
+    virtual wxEvent *Clone() const
+    {
+        wxThreadEvent* ev = new wxThreadEvent(*this);
+
+        // make sure our string member (which uses COW, aka refcounting) is not
+        // shared by other wxString instances:
+        ev->SetString(GetString().c_str());
+        return ev;
+    }
+
+    // this is important to avoid that calling wxEventLoopBase::YieldFor thread events
+    // gets processed when this is unwanted:
+    virtual wxEventCategory GetEventCategory() const
+        { return wxEVT_CATEGORY_THREAD; }
+
+private:
+    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent)
+};
+
+
+

 // Scroll event class, derived form wxCommandEvent. wxScrollEvents are
 // sent by wxSlider and wxScrollBar.
 /*
 // Scroll event class, derived form wxCommandEvent. wxScrollEvents are
 // sent by wxSlider and wxScrollBar.
 /*


@@ -984,7 +1180,7 @@ class WXDLLIMPEXP_CORE wxScrollWinEvent : public wxEvent
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);
 public:
     wxScrollWinEvent(wxEventType commandType = wxEVT_NULL,
                      int pos = 0, int orient = 0);

-    wxScrollWinEvent(const wxScrollWinEvent & event) : wxEvent(event)
+    wxScrollWinEvent(const wxScrollWinEvent& event) : wxEvent(event)

         {    m_commandInt = event.m_commandInt;
             m_extraLong = event.m_extraLong;    }
 
         {    m_commandInt = event.m_commandInt;
             m_extraLong = event.m_extraLong;    }
 


@@ -1003,6 +1199,8 @@ private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent)
 };
 

+
+

 // Mouse event class
 
 /*
 // Mouse event class
 
 /*


@@ -1183,6 +1381,7 @@ public:
     bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
 
     virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }
     bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); }
 
     virtual wxEvent *Clone() const { return new wxMouseEvent(*this); }

+    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }

 
     wxMouseEvent& operator=(const wxMouseEvent& event)
     {
 
     wxMouseEvent& operator=(const wxMouseEvent& event)
     {


@@ -1228,7 +1427,7 @@ public:
           m_x(x), m_y(y), m_cursor()
         { }
 
           m_x(x), m_y(y), m_cursor()
         { }
 

-    wxSetCursorEvent(const wxSetCursorEvent & event)
+    wxSetCursorEvent(const wxSetCursorEvent& event)

         : wxEvent(event),
           m_x(event.m_x),
           m_y(event.m_y),
         : wxEvent(event),
           m_x(event.m_x),
           m_y(event.m_y),


@@ -1306,6 +1505,7 @@ public:
     wxCoord GetY() const { return m_y; }
 
     virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }
     wxCoord GetY() const { return m_y; }
 
     virtual wxEvent *Clone() const { return new wxKeyEvent(*this); }

+    virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; }

 
     // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for
     // example)
 
     // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for
     // example)


@@ -1324,7 +1524,6 @@ public:
 
             m_keyCode = evt.m_keyCode;
 
 
             m_keyCode = evt.m_keyCode;
 

-            m_scanCode = evt.m_scanCode;

             m_rawCode = evt.m_rawCode;
             m_rawFlags = evt.m_rawFlags;
 #if wxUSE_UNICODE
             m_rawCode = evt.m_rawCode;
             m_rawFlags = evt.m_rawFlags;
 #if wxUSE_UNICODE


@@ -1339,9 +1538,6 @@ public:
 
     long          m_keyCode;
 
 
     long          m_keyCode;
 

-    // FIXME: what is this for? relation to m_rawXXX?
-    bool          m_scanCode;
-

 #if wxUSE_UNICODE
     // This contains the full Unicode character
     // in a character events in Unicode mode
 #if wxUSE_UNICODE
     // This contains the full Unicode character
     // in a character events in Unicode mode


@@ -1371,7 +1567,7 @@ public:
         : wxEvent(winid, wxEVT_SIZE),
           m_size(sz)
         { }
         : wxEvent(winid, wxEVT_SIZE),
           m_size(sz)
         { }

-    wxSizeEvent(const wxSizeEvent & event)
+    wxSizeEvent(const wxSizeEvent& event)

         : wxEvent(event),
           m_size(event.m_size), m_rect(event.m_rect)
         { }
         : wxEvent(event),
           m_size(event.m_size), m_rect(event.m_rect)
         { }


@@ -1440,7 +1636,9 @@ private:
  wxEVT_PAINT_ICON
  */
 
  wxEVT_PAINT_ICON
  */
 

-#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+#if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__))
+    #define wxHAS_PAINT_DEBUG
+

     // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined
     extern WXDLLIMPEXP_CORE int g_isPainting;
 #endif // debug
     // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined
     extern WXDLLIMPEXP_CORE int g_isPainting;
 #endif // debug


@@ -1451,15 +1649,15 @@ public:
     wxPaintEvent(int Id = 0)
         : wxEvent(Id, wxEVT_PAINT)
     {
     wxPaintEvent(int Id = 0)
         : wxEvent(Id, wxEVT_PAINT)
     {

-#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
-        // set the internal flag for the duration of processing of WM_PAINT
+#ifdef wxHAS_PAINT_DEBUG
+        // set the internal flag for the duration of redrawing

         g_isPainting++;
 #endif // debug
     }
 
     // default copy ctor and dtor are normally fine, we only need them to keep
     // g_isPainting updated in debug build
         g_isPainting++;
 #endif // debug
     }
 
     // default copy ctor and dtor are normally fine, we only need them to keep
     // g_isPainting updated in debug build

-#if defined(__WXDEBUG__) && (defined(__WXMSW__) || defined(__WXPM__))
+#ifdef wxHAS_PAINT_DEBUG

     wxPaintEvent(const wxPaintEvent& event)
             : wxEvent(event)
     {
     wxPaintEvent(const wxPaintEvent& event)
             : wxEvent(event)
     {


@@ -1626,7 +1824,7 @@ public:
     wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL)
         : wxEvent(winid, type)
         { m_menuId = winid; m_menu = menu; }
     wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL)
         : wxEvent(winid, type)
         { m_menuId = winid; m_menu = menu; }

-    wxMenuEvent(const wxMenuEvent & event)
+    wxMenuEvent(const wxMenuEvent& event)

         : wxEvent(event)
     { m_menuId = event.m_menuId; m_menu = event.m_menu; }
 
         : wxEvent(event)
     { m_menuId = event.m_menuId; m_menu = event.m_menu; }
 


@@ -1664,7 +1862,7 @@ public:
           m_veto(false),      // should be false by default
           m_canVeto(true) {}
 
           m_veto(false),      // should be false by default
           m_canVeto(true) {}
 

-    wxCloseEvent(const wxCloseEvent & event)
+    wxCloseEvent(const wxCloseEvent& event)

         : wxEvent(event),
         m_loggingOff(event.m_loggingOff),
         m_veto(event.m_veto),
         : wxEvent(event),
         m_loggingOff(event.m_loggingOff),
         m_veto(event.m_veto),


@@ -1714,7 +1912,7 @@ public:
     wxShowEvent(int winid = 0, bool show = false)
         : wxEvent(winid, wxEVT_SHOW)
         { m_show = show; }
     wxShowEvent(int winid = 0, bool show = false)
         : wxEvent(winid, wxEVT_SHOW)
         { m_show = show; }

-    wxShowEvent(const wxShowEvent & event)
+    wxShowEvent(const wxShowEvent& event)

         : wxEvent(event)
     { m_show = event.m_show; }
 
         : wxEvent(event)
     { m_show = event.m_show; }
 


@@ -1746,7 +1944,7 @@ public:
     wxIconizeEvent(int winid = 0, bool iconized = true)
         : wxEvent(winid, wxEVT_ICONIZE)
         { m_iconized = iconized; }
     wxIconizeEvent(int winid = 0, bool iconized = true)
         : wxEvent(winid, wxEVT_ICONIZE)
         { m_iconized = iconized; }

-    wxIconizeEvent(const wxIconizeEvent & event)
+    wxIconizeEvent(const wxIconizeEvent& event)

         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 
         : wxEvent(event)
     { m_iconized = event.m_iconized; }
 


@@ -1828,7 +2026,7 @@ public:
           m_joyStick(joystick)
     {
     }
           m_joyStick(joystick)
     {
     }

-    wxJoystickEvent(const wxJoystickEvent & event)
+    wxJoystickEvent(const wxJoystickEvent& event)

         : wxEvent(event),
           m_pos(event.m_pos),
           m_zPosition(event.m_zPosition),
         : wxEvent(event),
           m_pos(event.m_pos),
           m_zPosition(event.m_zPosition),


@@ -1963,7 +2161,7 @@ public:
         m_setText =
         m_setChecked = false;
     }
         m_setText =
         m_setChecked = false;
     }

-    wxUpdateUIEvent(const wxUpdateUIEvent & event)
+    wxUpdateUIEvent(const wxUpdateUIEvent& event)

         : wxCommandEvent(event),
           m_checked(event.m_checked),
           m_enabled(event.m_enabled),
         : wxCommandEvent(event),
           m_checked(event.m_checked),
           m_enabled(event.m_enabled),


@@ -2159,7 +2357,7 @@ public:
         : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE),
           m_paletteRealized(false)
         { }
         : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE),
           m_paletteRealized(false)
         { }

-    wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent & event)
+    wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent& event)

         : wxEvent(event),
         m_paletteRealized(event.m_paletteRealized)
     { }
         : wxEvent(event),
         m_paletteRealized(event.m_paletteRealized)
     { }


@@ -2229,7 +2427,7 @@ public:
 
     virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); }
 
 
     virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); }
 

-    enum
+    enum wxNavigationKeyEventFlags

     {
         IsBackward = 0x0000,
         IsForward = 0x0001,
     {
         IsBackward = 0x0000,
         IsForward = 0x0001,


@@ -2305,7 +2503,7 @@ public:
           m_pos(pt),
           m_origin(GuessOrigin(origin))
     { }
           m_pos(pt),
           m_origin(GuessOrigin(origin))
     { }

-    wxHelpEvent(const wxHelpEvent & event)
+    wxHelpEvent(const wxHelpEvent& event)

         : wxCommandEvent(event),
           m_pos(event.m_pos),
           m_target(event.m_target),
         : wxCommandEvent(event),
           m_pos(event.m_pos),
           m_target(event.m_target),


@@ -2363,7 +2561,7 @@ public:
                      wxWindowID winid = 0)
         : wxCommandEvent(type, winid)
     { }
                      wxWindowID winid = 0)
         : wxCommandEvent(type, winid)
     { }

-    wxClipboardTextEvent(const wxClipboardTextEvent & event)
+    wxClipboardTextEvent(const wxClipboardTextEvent& event)

         : wxCommandEvent(event)
     { }
 
         : wxCommandEvent(event)
     { }
 


@@ -2390,7 +2588,7 @@ public:
         : wxCommandEvent(type, winid),
           m_pos(pt)
     { }
         : wxCommandEvent(type, winid),
           m_pos(pt)
     { }

-    wxContextMenuEvent(const wxContextMenuEvent & event)
+    wxContextMenuEvent(const wxContextMenuEvent& event)

         : wxCommandEvent(event),
         m_pos(event.m_pos)
     { }
         : wxCommandEvent(event),
         m_pos(event.m_pos)
     { }


@@ -2436,7 +2634,7 @@ public:
         : wxEvent(0, wxEVT_IDLE),
           m_requestMore(false)
         { }
         : wxEvent(0, wxEVT_IDLE),
           m_requestMore(false)
         { }

-    wxIdleEvent(const wxIdleEvent & event)
+    wxIdleEvent(const wxIdleEvent& event)

         : wxEvent(event),
           m_requestMore(event.m_requestMore)
     { }
         : wxEvent(event),
           m_requestMore(event.m_requestMore)
     { }


@@ -2473,6 +2671,7 @@ private:
 */
 
 
 */
 
 

+

 // ============================================================================
 // event handler and related classes
 // ============================================================================
 // ============================================================================
 // event handler and related classes
 // ============================================================================


@@ -2502,7 +2701,7 @@ struct WXDLLIMPEXP_BASE wxEventTableEntryBase
         // being initialized (a temporary instance is created and then this
         // constructor is called).
 
         // being initialized (a temporary instance is created and then this
         // constructor is called).
 

-        const_cast< wxEventTableEntryBase & >( entry ).m_fn = NULL;
+        const_cast<wxEventTableEntryBase&>( entry ).m_fn = NULL;

     }
 
     ~wxEventTableEntryBase()
     }
 
     ~wxEventTableEntryBase()


@@ -2522,7 +2721,7 @@ struct WXDLLIMPEXP_BASE wxEventTableEntryBase
     wxObject* m_callbackUserData;
 
 private:
     wxObject* m_callbackUserData;
 
 private:

-    wxEventTableEntryBase &operator = ( const wxEventTableEntryBase & );
+    wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase);

 };
 
 // an entry from a static event table
 };
 
 // an entry from a static event table


@@ -2543,7 +2742,7 @@ struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase
     const int& m_eventType;
 
 private:
     const int& m_eventType;
 
 private:

-    wxEventTableEntry &operator = ( const wxEventTableEntry & );
+    wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntry);

 };
 
 // an entry used in dynamic event table managed by wxEvtHandler::Connect()
 };
 
 // an entry used in dynamic event table managed by wxEvtHandler::Connect()


@@ -2561,7 +2760,7 @@ struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase
     int m_eventType;
 
 private:
     int m_eventType;
 
 private:

-    wxDynamicEventTableEntry &operator = ( const wxDynamicEventTableEntry & );
+    wxDECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -2602,15 +2801,16 @@ public:
 
     // Handle the given event, in other words search the event table hash
     // and call self->ProcessEvent() if a match was found.
 
     // Handle the given event, in other words search the event table hash
     // and call self->ProcessEvent() if a match was found.

-    bool HandleEvent(wxEvent &event, wxEvtHandler *self);
+    bool HandleEvent(wxEvent& event, wxEvtHandler *self);

 
     // Clear table
     void Clear();
 
 
     // Clear table
     void Clear();
 

-#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
-    // Clear all tables
+#if wxUSE_MEMORY_TRACING
+    // Clear all tables: only used to work around problems in memory tracing
+    // code

     static void ClearAll();
     static void ClearAll();

-#endif // __WXDEBUG__ && wxUSE_MEMORY_TRACING
+#endif // wxUSE_MEMORY_TRACING

 
 protected:
     // Init the hash table with the entries of the static event table.
 
 protected:
     // Init the hash table with the entries of the static event table.


@@ -2634,7 +2834,7 @@ protected:
     wxEventHashTable* m_previous;
     wxEventHashTable* m_next;
 
     wxEventHashTable* m_previous;
     wxEventHashTable* m_next;
 

-    DECLARE_NO_COPY_CLASS(wxEventHashTable)
+    wxDECLARE_NO_COPY_CLASS(wxEventHashTable);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -2648,14 +2848,26 @@ public:
     wxEvtHandler();
     virtual ~wxEvtHandler();
 
     wxEvtHandler();
     virtual ~wxEvtHandler();
 

+
+    // Event handler chain
+    // -------------------
+

     wxEvtHandler *GetNextHandler() const { return m_nextHandler; }
     wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; }
     wxEvtHandler *GetNextHandler() const { return m_nextHandler; }
     wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; }

-    void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
-    void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }
+    virtual void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; }
+    virtual void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; }

 
     void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; }
     bool GetEvtHandlerEnabled() const { return m_enabled; }
 
 
     void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; }
     bool GetEvtHandlerEnabled() const { return m_enabled; }
 

+    void Unlink();
+    bool IsUnlinked() const;
+
+
+
+    // Event queuing and processing
+    // ----------------------------
+

     // Process an event right now: this can only be called from the main
     // thread, use QueueEvent() for scheduling the events for
     // processing from other threads.
     // Process an event right now: this can only be called from the main
     // thread, use QueueEvent() for scheduling the events for
     // processing from other threads.


@@ -2666,6 +2878,7 @@ public:
     // when called from C code (e.g. in GTK+ callback) when the exception
     // wouldn't correctly propagate to wxEventLoop.
     bool SafelyProcessEvent(wxEvent& event);
     // when called from C code (e.g. in GTK+ callback) when the exception
     // wouldn't correctly propagate to wxEventLoop.
     bool SafelyProcessEvent(wxEvent& event);

+        // NOTE: uses ProcessEvent()

 
     // Schedule the given event to be processed later. It takes ownership of
     // the event pointer, i.e. it will be deleted later. This is safe to call
 
     // Schedule the given event to be processed later. It takes ownership of
     // the event pointer, i.e. it will be deleted later. This is safe to call


@@ -2688,11 +2901,28 @@ public:
     }
 
     void ProcessPendingEvents();
     }
 
     void ProcessPendingEvents();

+        // NOTE: uses ProcessEvent()
+
+    void DeletePendingEvents();

 
 #if wxUSE_THREADS
     bool ProcessThreadEvent(const wxEvent& event);
 
 #if wxUSE_THREADS
     bool ProcessThreadEvent(const wxEvent& event);

+        // NOTE: uses AddPendingEvent(); call only from secondary threads

 #endif
 
 #endif
 

+
+    // Connecting and disconnecting
+    // ----------------------------
+
+    // These functions are used for old, untyped, event handlers and don't
+    // check that the type of the function passed to them actually matches the
+    // type of the event. They also only allow connecting events to methods of
+    // wxEvtHandler-derived classes.
+    //
+    // The template Connect() methods below are safer and allow connecting
+    // events to arbitrary functions or functors -- but require compiler
+    // support for templates.
+

     // Dynamic association of a member function handler with the event handler,
     // winid and event type
     void Connect(int winid,
     // Dynamic association of a member function handler with the event handler,
     // winid and event type
     void Connect(int winid,


@@ -2702,9 +2932,9 @@ public:
                  wxObject *userData = NULL,
                  wxEvtHandler *eventSink = NULL)
     {
                  wxObject *userData = NULL,
                  wxEvtHandler *eventSink = NULL)
     {

-        wxObjectEventFunctor *functor = wxNewEventFunctor( eventType, func, eventSink );
-
-        Subscribe( winid, lastId, eventType, functor, userData );
+        DoConnect(winid, lastId, eventType,
+                  wxNewEventFunctor(eventType, func, eventSink),
+                  userData);

     }
 
     // Convenience function: take just one id
     }
 
     // Convenience function: take just one id


@@ -2729,9 +2959,9 @@ public:
                     wxObject *userData = NULL,
                     wxEvtHandler *eventSink = NULL)
     {
                     wxObject *userData = NULL,
                     wxEvtHandler *eventSink = NULL)
     {

-        wxObjectEventFunctor functor = wxConstructEventFunctor( eventType, func, eventSink );
-
-        return Unsubscribe( winid, lastId, eventType, functor, userData );
+        return DoDisconnect(winid, lastId, eventType,
+                            wxMakeEventFunctor(eventType, func, eventSink),
+                            userData );

     }
 
     bool Disconnect(int winid = wxID_ANY,
     }
 
     bool Disconnect(int winid = wxID_ANY,


@@ -2747,309 +2977,64 @@ public:
                     wxEvtHandler *eventSink = NULL)
         { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); }
 
                     wxEvtHandler *eventSink = NULL)
         { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); }
 

-

 #if !wxEVENTS_COMPATIBILITY_2_8
 #if !wxEVENTS_COMPATIBILITY_2_8

-    //
-    // Connect a function to an event:
-    //
-    template <typename EventType>
-    void Connect(int winid,
-                 int lastId,
-                 const EventType &eventType,
-                 void (*func)(typename EventType::CorrespondingEvent&),
-                 wxObject* userData = NULL)
+    // Bind arbitrary functor (including just a function) to an event:
+    template <typename EventTag, typename Functor>
+    void Bind(const EventTag& eventType,
+              Functor functor,
+              int winid = wxID_ANY,
+              int lastId = wxID_ANY,
+              wxObject *userData = NULL)

     {
     {

-        wxEventFunctorFunction< EventType > *functor = wxNewEventFunctor( eventType, func );
-
-        Subscribe( winid, lastId, eventType, functor, userData );
+        DoConnect(winid, lastId, eventType,
+                  wxNewEventFunctor(eventType, functor),
+                  userData);

     }
 
     }
 

-    template <typename EventType>
-    void Connect( int winid,
-            const EventType &eventType,
-            void ( *func )( typename EventType::CorrespondingEvent & ),
-            wxObject* userData = NULL )
-        { Connect( winid, wxID_ANY, eventType, func, userData ); }

 
 

-    template <typename EventType>
-    void Connect( const EventType &eventType,
-            void ( *func )( typename EventType::CorrespondingEvent & ),
-            wxObject* userData = NULL )
-        { Connect( wxID_ANY, wxID_ANY, eventType, func, userData ); }
-
-    //
-    // Connect a method to an event:
-    //
-
-    template <typename EventType, typename Class>
-    void Connect( int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        {
-            wxEventFunctorMethod< EventType, Class, Class > *functor =
-                wxNewEventFunctor( eventType, func, static_cast< Class * const >( this ));
-
-            Subscribe( winid, lastId, eventType, functor, userData );
-        }
-
-    template <typename EventType, typename Class>
-    void Connect( int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        { Connect( winid, wxID_ANY, eventType, func, userData ); }
-
-    template <typename EventType, typename Class>
-    void Connect( const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        { Connect( wxID_ANY, wxID_ANY, eventType, func, userData ); }
-
-    template <typename EventType, typename Class, typename Derived>
-    void Connect( int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        {
-            wxEventFunctorMethod< EventType, Class, Derived > *functor =
-                wxNewEventFunctor( eventType, func, eventSink );
-
-            Subscribe( winid, lastId, eventType, functor, userData );
-        }
-
-    template <typename EventType, typename Class, typename Derived>
-    void Connect( int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { Connect( winid, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename EventType, typename Class, typename Derived>
-    void Connect( const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { Connect( wxID_ANY, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static void Connect( Sender *sender,
-            int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-    {
-        wxEventFunctorMethod< EventType, Class, Derived > *functor =
-            wxNewEventFunctor( eventType, func, eventSink );
-
-        sender->Subscribe( winid, lastId, eventType, functor, userData );
-    }
-
-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static void Connect( Sender *sender,
-            int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { Connect( sender, winid, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static void Connect( Sender *sender,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { Connect( sender, wxID_ANY, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    //
-    // Connect an arbitrary functor to an event:
-    //
-
-    template <typename EventType, typename Functor>
-    void Connect( int winid,
-            int lastId,
-            const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
-    {
-        wxEventFunctorAdapter< EventType, Functor > *adapter =
-            wxNewEventFunctor( eventType, functor );
-
-        Subscribe( winid, lastId, eventType, adapter, userData );
-    }
-    template <typename EventType, typename Functor>
-    void Connect( int winid,
-            const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
-        { Connect( winid, wxID_ANY, eventType, functor, userData ); }
-
-    template <typename EventType, typename Functor>
-    void Connect( const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
-        { Connect( wxID_ANY, wxID_ANY, eventType, functor, userData ); }
-
-    //
-    // Disconnect a function from an event:
-    //
-
-    template <typename EventType>
-    bool Disconnect( int winid,
-        int lastId,
-        const EventType &eventType,
-        void ( *func )( typename EventType::CorrespondingEvent & ),
-        wxObject* userData = NULL )
+    template <typename EventTag, typename Functor>
+    bool Unbind(const EventTag& eventType,
+                Functor functor,
+                int winid = wxID_ANY,
+                int lastId = wxID_ANY,
+                wxObject *userData = NULL)

     {
     {

-        wxEventFunctorFunction< EventType > functor = wxConstructEventFunctor( eventType, func );
-
-        return Unsubscribe( winid, lastId, eventType, functor, userData );
+        return DoDisconnect(winid, lastId, eventType,
+                            wxMakeEventFunctor(eventType, functor),
+                            userData);

     }
 
     }
 

-    template <typename EventType>
-    bool Disconnect( int winid,
-            const EventType &eventType,
-            void ( *func )( typename EventType::CorrespondingEvent & ),
-            wxObject* userData = NULL )
-        { return Disconnect( winid, wxID_ANY, eventType, func, userData ); }
-
-    template <typename EventType>
-    bool Disconnect( const EventType &eventType,
-            void ( *func )( typename EventType::CorrespondingEvent & ),
-            wxObject* userData = NULL )
-        { return Disconnect( wxID_ANY, wxID_ANY, eventType, func, userData ); }
-
-    //
-    // Disconnect a method from an event:
-    //

 
 

-    template <typename EventType, typename Class>
-    bool Disconnect( int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        {
-            wxEventFunctorMethod< EventType, Class, Class > functor =
-                wxConstructEventFunctor( eventType, func, static_cast< Class * const >( this ));
-
-            return Unsubscribe( winid, lastId, eventType, functor, userData );
-        }
-
-    template <typename EventType, typename Class>
-    bool Disconnect( int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        { return Disconnect( winid, wxID_ANY, eventType, func, userData ); }
-
-    template <typename EventType, typename Class>
-    bool Disconnect( const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL )
-        { return Disconnect( wxID_ANY, wxID_ANY, eventType, func, userData ); }
-
-    template <typename EventType, typename Class, typename Derived>
-    bool Disconnect( int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        {
-            wxEventFunctorMethod< EventType, Class, Derived > functor =
-                wxConstructEventFunctor( eventType, func, eventSink );
-
-            return Unsubscribe( winid, lastId, eventType, functor, userData );
-        }
+    // Bind a method of a class (called on the specified handler which must
+    // be convertible to this class) object to an event:

 
 

-    template <typename EventType, typename Class, typename Derived>
-    bool Disconnect( int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { return Disconnect( winid, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename EventType, typename Class, typename Derived>
-    bool Disconnect( const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { return Disconnect( wxID_ANY, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static bool Disconnect( Sender *sender,
-            int winid,
-            int lastId,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
+    template <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+    void Bind(const EventTag &eventType,
+              void (Class::*method)(EventArg &),
+              EventHandler *handler,
+              int winid = wxID_ANY,
+              int lastId = wxID_ANY,
+              wxObject *userData = NULL)

     {
     {

-        wxEventFunctorMethod< EventType, Class, Derived > functor =
-            wxConstructEventFunctor( eventType, func, eventSink );
-
-        return sender->Unsubscribe( winid, lastId, eventType, functor, userData );
+        DoConnect(winid, lastId, eventType,
+                  wxNewEventFunctor(eventType, method, handler),
+                  userData);

     }
 
     }
 

-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static bool Disconnect( Sender *sender,
-            int winid,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { return Disconnect( sender, winid, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    template <typename Sender, typename EventType, typename Class, typename Derived>
-    static bool Disconnect( Sender *sender,
-            const EventType &eventType,
-            void ( Class::*func )( typename EventType::CorrespondingEvent & ),
-            wxObject *userData = NULL,
-            Derived *eventSink = NULL )
-        { return Disconnect( sender, wxID_ANY, wxID_ANY, eventType, func, userData, eventSink ); }
-
-    //
-    // Disconnect an arbitrary functor from an event:
-    //
-
-    template <typename EventType, typename Functor>
-    bool Disconnect( int winid,
-            int lastId,
-            const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
+    template <typename EventTag, typename Class, typename EventArg, typename EventHandler>
+    bool Unbind(const EventTag &eventType,
+                void (Class::*method)(EventArg&),
+                EventHandler *handler,
+                int winid = wxID_ANY,
+                int lastId = wxID_ANY,
+                wxObject *userData = NULL )

     {
     {

-        wxEventFunctorAdapter< EventType, Functor > adapter =
-            wxConstructEventFunctor( eventType, functor );
-
-        return Unsubscribe( winid, lastId, eventType, adapter, userData );
+        return DoDisconnect(winid, lastId, eventType,
+                            wxMakeEventFunctor(eventType, method, handler),
+                            userData);

     }
     }

-
-    template <typename EventType, typename Functor>
-    bool Disconnect( int winid,
-            const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
-        { return Disconnect( winid, wxID_ANY, eventType, functor, userData ); }
-
-    template <typename EventType, typename Functor>
-    bool Disconnect( const EventType &eventType,
-            Functor &functor,
-            wxObject* userData = NULL)
-        { return Disconnect( wxID_ANY, wxID_ANY, eventType, functor, userData ); }
-

 #endif // !wxEVENTS_COMPATIBILITY_2_8
 
 #endif // !wxEVENTS_COMPATIBILITY_2_8
 

-

     wxList* GetDynamicEventTable() const { return m_dynamicEvents ; }
 
     // User data can be associated with each wxEvtHandler
     wxList* GetDynamicEventTable() const { return m_dynamicEvents ; }
 
     // User data can be associated with each wxEvtHandler


@@ -3081,31 +3066,26 @@ public:
     void OnSinkDestroyed( wxEvtHandler *sink );
 
 
     void OnSinkDestroyed( wxEvtHandler *sink );
 
 

-    // The method processing the event in this event handler (or rather in this
-    // event handler chain as it also tries the next handler and so on), i.e.
-    // it returns true if we processed this event or false if we didn't but
-    // does not call TryParent() in the latter case. It also doesn't call
-    // wxApp::FilterEvent() before processing it, this is supposed to be done
-    // by the public ProcessEvent() only once for every event we handle.
+    // The method tries to process the event in this event handler.

     //
     // It is meant to be called from ProcessEvent() only and is not virtual,
     // additional event handlers can be hooked into the normal event processing
     //
     // It is meant to be called from ProcessEvent() only and is not virtual,
     // additional event handlers can be hooked into the normal event processing

-    // logic using TryValidator() hook.
+    // logic using TryBefore() and TryAfter() hooks.

     bool ProcessEventHere(wxEvent& event);
 
 
 private:
     bool ProcessEventHere(wxEvent& event);
 
 
 private:

-    void Subscribe(int winid,
+    void DoConnect(int winid,

                    int lastId,
                    wxEventType eventType,
                    wxEventFunctor *func,
                    int lastId,
                    wxEventType eventType,
                    wxEventFunctor *func,

-                   wxObject* userData);
+                   wxObject* userData = NULL);

 
 

-    bool Unsubscribe(int winid,
-                     int lastId,
-                     wxEventType eventType,
-                     const wxEventFunctor &func,
-                     wxObject *userData);
+    bool DoDisconnect(int winid,
+                      int lastId,
+                      wxEventType eventType,
+                      const wxEventFunctor& func,
+                      wxObject *userData = NULL);

 
     static const wxEventTableEntry sm_eventTableEntries[];
 
 
     static const wxEventTableEntry sm_eventTableEntries[];
 


@@ -3113,21 +3093,25 @@ protected:
     // hooks for wxWindow used by ProcessEvent()
     // -----------------------------------------
 
     // hooks for wxWindow used by ProcessEvent()
     // -----------------------------------------
 

-    // This one is called before trying our own event table to allow plugging
-    // in the validators.
-    //
-    // NB: This method is intentionally *not* inside wxUSE_VALIDATORS!
-    //     It is part of wxBase which doesn't use validators and the code
-    //     is compiled out when building wxBase w/o GUI classes, which affects
-    //     binary compatibility and wxBase library can't be used by GUI
-    //     ports.
-    virtual bool TryValidator(wxEvent& WXUNUSED(event)) { return false; }
+    // this one is called before trying our own event table to allow plugging
+    // in the event handlers overriding the default logic, this is used by e.g.
+    // validators.
+    virtual bool TryBefore(wxEvent& event);

 
     // this one is called after failing to find the event handle in our own
     // table to give a chance to the other windows to process it
     //
     // base class implementation passes the event to wxTheApp
 
     // this one is called after failing to find the event handle in our own
     // table to give a chance to the other windows to process it
     //
     // base class implementation passes the event to wxTheApp

-    virtual bool TryParent(wxEvent& event);
+    virtual bool TryAfter(wxEvent& event);
+
+#ifdef WXWIN_COMPATIBILITY_2_8
+    // deprecated method: override TryBefore() instead of this one
+    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
+        virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; )
+
+    wxDEPRECATED_BUT_USED_INTERNALLY_INLINE(
+        virtual bool TryParent(wxEvent& event), return DoTryApp(event); )
+#endif // WXWIN_COMPATIBILITY_2_8

 
 
     static const wxEventTable sm_eventTable;
 
 
     static const wxEventTable sm_eventTable;


@@ -3172,12 +3156,17 @@ protected:
     virtual void *DoGetClientData() const;
 
     // Search tracker objects for event connection with this sink
     virtual void *DoGetClientData() const;
 
     // Search tracker objects for event connection with this sink

-    wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *eventSink);
+    wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *handler);

 
 private:
 
 private:

+    // pass the event to wxTheApp instance, called from TryAfter()
+    bool DoTryApp(wxEvent& event);
+

     DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
 };
 
     DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler)
 };
 

+WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE);
+

 // ----------------------------------------------------------------------------
 // wxEventConnectionRef represents all connections between two event handlers
 // and enables automatic disconnect when an event handler sink goes out of
 // ----------------------------------------------------------------------------
 // wxEventConnectionRef represents all connections between two event handlers
 // and enables automatic disconnect when an event handler sink goes out of


@@ -3224,9 +3213,16 @@ private:
 
     friend class wxEvtHandler;
 
 
     friend class wxEvtHandler;
 

-    DECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef)
+    wxDECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef);

 };
 
 };
 

+inline void wxObjectEventFunctor::operator()(wxEvtHandler *handler, wxEvent& event)
+{
+    wxEvtHandler * const realHandler = m_handler ? m_handler : handler;
+
+    (realHandler->*m_method)(event);
+}
+

 // Post a message to the given event handler which will be processed during the
 // next event loop iteration.
 //
 // Post a message to the given event handler which will be processed during the
 // next event loop iteration.
 //


@@ -3279,10 +3275,11 @@ protected:
     wxArrayInt m_eventsToBlock;
     wxWindow *m_window;
 
     wxArrayInt m_eventsToBlock;
     wxWindow *m_window;
 

-    DECLARE_NO_COPY_CLASS(wxEventBlocker)
+    wxDECLARE_NO_COPY_CLASS(wxEventBlocker);

 };
 
 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);
 };
 
 typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&);

+typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&);

 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
 typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);
 typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&);
 typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&);
 typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&);
 typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&);


@@ -3322,6 +3319,8 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 
 #define wxCommandEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxCommandEventFunction, func)
 
 #define wxCommandEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxCommandEventFunction, func)

+#define wxThreadEventHandler(func) \
+    wxEVENT_HANDLER_CAST(wxThreadEventFunction, func)

 #define wxScrollEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxScrollEventFunction, func)
 #define wxScrollWinEventHandler(func) \
 #define wxScrollEventHandler(func) \
     wxEVENT_HANDLER_CAST(wxScrollEventFunction, func)
 #define wxScrollWinEventHandler(func) \


@@ -3755,6 +3754,8 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func))
 #define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_ENTER, winid, wxCommandEventHandler(func))
 #define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, winid, wxCommandEventHandler(func))
 #define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_COMMAND_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func))
 #define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TOOL_ENTER, winid, wxCommandEventHandler(func))
 #define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_CHECKLISTBOX_TOGGLED, winid, wxCommandEventHandler(func))

+#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func))
+#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func))

 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func))
 
 // Generic command events
 #define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func))


@@ -3801,22 +3802,48 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
 #define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_COPY, winid, wxClipboardTextEventHandler(func))
 #define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func))
 
 #define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_COPY, winid, wxClipboardTextEventHandler(func))
 #define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_TEXT_PASTE, winid, wxClipboardTextEventHandler(func))
 

-// ----------------------------------------------------------------------------
-// Global data
-// ----------------------------------------------------------------------------
-
-// list containing event handlers with pending events for them
-//
-// notice that each event handler should occur at most once in this list
-extern WXDLLIMPEXP_BASE wxList *wxHandlersWithPendingEvents;
-#if wxUSE_THREADS
-    extern WXDLLIMPEXP_BASE wxCriticalSection *wxHandlersWithPendingEventsLocker;
-#endif
+// Thread events
+#define EVT_THREAD(id, func)  wx__DECLARE_EVT1(wxEVT_COMMAND_THREAD, id, wxThreadEventHandler(func))

 
 // ----------------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------------
 

+// This is an ugly hack to allow the use of Bind() instead of Connect() inside
+// the library code if the library was built with support for it, here is how
+// it is used:
+//
+// class SomeEventHandlingClass : wxBIND_OR_CONNECT_HACK_BASE_CLASS
+//                                public SomeBaseClass
+// {
+// public:
+//     SomeEventHandlingClass(wxWindow *win)
+//     {
+//         // connect to the event for the given window
+//         wxBIND_OR_CONNECT_HACK(win, wxEVT_SOMETHING, wxSomeEventHandler,
+//                                SomeEventHandlingClass::OnSomeEvent, this);
+//     }
+//
+// private:
+//     void OnSomeEvent(wxSomeEvent&) { ... }
+// };
+//
+// This is *not* meant to be used by library users, it is only defined here
+// (and not in a private header) because the base class must be visible from
+// other public headers, please do NOT use this in your code, it will be
+// removed from future wx versions without warning.
+#if wxEVENTS_COMPATIBILITY_2_8
+    #define wxBIND_OR_CONNECT_HACK_BASE_CLASS public wxEvtHandler,
+    #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS : public wxEvtHandler
+    #define wxBIND_OR_CONNECT_HACK(w, evt, handler, func, obj) \
+        win->Connect(evt, handler(func), NULL, obj)
+#else // wxEVENTS_COMPATIBILITY_2_8
+    #define wxBIND_OR_CONNECT_HACK_BASE_CLASS
+    #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS
+    #define wxBIND_OR_CONNECT_HACK(w, evt, handler, func, obj) \
+        win->Bind(evt, &func, obj)
+#endif // wxEVENTS_COMPATIBILITY_2_8/!wxEVENTS_COMPATIBILITY_2_8
+

 #if wxUSE_GUI
 
 // Find a window with the focus, that is also a descendant of the given window.
 #if wxUSE_GUI
 
 // Find a window with the focus, that is also a descendant of the given window.