X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab826fd86ffd5aadd2246c14337369aa6af9fab5..032e024c1c6ab6a20226604baab9d00558620e72:/include/wx/event.h diff --git a/include/wx/event.h b/include/wx/event.h index d3bcc5b275..210d323bb8 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -26,8 +26,9 @@ #include "wx/dynarray.h" #include "wx/thread.h" #include "wx/tracker.h" +#include "wx/typeinfo.h" -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND #include "wx/meta/convertible.h" #endif @@ -99,68 +100,59 @@ typedef int wxEventType; // generate a new unique event type extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); -// New macros to create templatized event types: - -#if wxEVENTS_COMPATIBILITY_2_8 - - // Define/Declare a wxEventType-based event type: +// define macros to create new event types: +#ifdef wxHAS_EVENT_BIND + // events are represented by an instance of wxEventTypeTag and the + // corresponding type must be specified for type-safety checks + // define a new custom event type, can be used alone or after event + // declaration in the header using one of the macros below #define wxDEFINE_EVENT( name, type ) \ - const wxEventType name( wxNewEventType() ) + const wxEventTypeTag< type > name( wxNewEventType() ) + // the general version allowing exporting the event type from DLL, used by + // wxWidgets itself #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ - 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 wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ - extern const expdecl wxEventType name - - // Declare a local (not exported) wxEventType-based event type: + extern const expdecl wxEventTypeTag< type > name + // this is the version which will normally be used in the user code #define wxDECLARE_EVENT( name, type ) \ wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) -#else - // Define/Declare a templatized event type with the corresponding event as - // a nested typedef: - - #define wxDEFINE_EVENT( name, type ) \ - const wxEventTypeTag< type > name( wxNewEventType() ) - - #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ - extern const expdecl wxEventTypeTag< type > name - - // Define/Declare a templatized event type and initialize it with a - // predefined event type. (Only used for wxEVT_SPIN_XXX for backward - // compatibility) + // these macros are only used internally for backwards compatibility and + // allow to define an alias for an existing event type (this is used by + // wxEVT_SPIN_XXX) #define wxDEFINE_EVENT_ALIAS( name, type, value ) \ const wxEventTypeTag< type > name( value ) #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ extern const expdecl wxEventTypeTag< type > name +#else // !wxHAS_EVENT_BIND + // the macros are the same ones as above but defined differently as we only + // use the integer event type values to identify events in this case - // Declare a local (not exported) templatized event type: + #define wxDEFINE_EVENT( name, type ) \ + const wxEventType name( wxNewEventType() ) + #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ + extern const expdecl wxEventType name #define wxDECLARE_EVENT( name, type ) \ wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) -#endif + #define wxDEFINE_EVENT_ALIAS( name, type, value ) \ + const wxEventType name = value + #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ + extern const expdecl wxEventType name +#endif // wxHAS_EVENT_BIND/!wxHAS_EVENT_BIND // Try to cast the given event handler to the correct handler type: #define wxEVENT_HANDLER_CAST( functype, func ) \ ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func ) -// Template which associates the correct event object with the event type -#if !wxEVENTS_COMPATIBILITY_2_8 +#ifdef wxHAS_EVENT_BIND // 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 @@ -184,7 +176,7 @@ private: wxEventType m_type; }; -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND // These are needed for the functor definitions typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); @@ -198,7 +190,6 @@ typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); // compiler we can restore its old definition for it. typedef wxEventFunction wxObjectEventFunction; - // The event functor which is stored in the static and dynamic event tables: class WXDLLIMPEXP_BASE wxEventFunctor { @@ -209,54 +200,72 @@ public: 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; + // finding it in an event table in Unbind(), by the given functor: + virtual bool IsMatching(const wxEventFunctor& functor) const = 0; + + // If the functor holds an wxEvtHandler, then get access to it and track + // its lifetime with wxEventConnectionRef: + virtual wxEvtHandler *GetEvtHandler() const + { return NULL; } - // these functions are used for functors comparison in Matches() - virtual void *GetHandler() const { return GetEvtHandler(); } - virtual wxEventFunction GetMethod() const { return NULL; } + // This is only used to maintain backward compatibility in + // wxAppConsoleBase::CallEventHandler and ensures that an overwritten + // wxAppConsoleBase::HandleEvent is still called for functors which hold an + // wxEventFunction: + virtual wxEventFunction GetEvtMethod() 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; } +private: + WX_DECLARE_ABSTRACT_TYPEINFO(wxEventFunctor) }; -// 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 +// A plain method functor for the untyped legacy event types: class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor { public: wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler) + : m_handler( handler ), m_method( method ) + { } + + virtual void operator()(wxEvtHandler *handler, wxEvent& event) { - m_handler = handler; - m_method = method; - } + wxEvtHandler * const realHandler = m_handler ? m_handler : handler; - virtual void operator()(wxEvtHandler *handler, wxEvent& event); + (realHandler->*m_method)(event); + } - virtual bool Matches(const wxEventFunctor& func) const + virtual bool IsMatching(const wxEventFunctor& functor) const { - void * const handler = func.GetHandler(); - if ( handler && GetHandler() != handler ) - return false; + if ( wxTypeId(functor) == wxTypeId(*this) ) + { + const wxObjectEventFunctor &other = + static_cast< const wxObjectEventFunctor & >( functor ); - 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!) - // 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; + return ( m_method == other.m_method || other.m_method == NULL ) && + ( m_handler == other.m_handler || other.m_handler == NULL ); + } + else + return false; } - virtual wxEvtHandler *GetEvtHandler() const { return m_handler; } - virtual wxEventFunction GetMethod() const { return m_method; } + virtual wxEvtHandler *GetEvtHandler() const + { return m_handler; } + + virtual wxEventFunction GetEvtMethod() const + { return m_method; } private: wxEvtHandler *m_handler; wxEventFunction m_method; -}; -#if wxEVENTS_COMPATIBILITY_2_8 + // Provide a dummy default ctor for type info purposes + wxObjectEventFunctor() { } + + WX_DECLARE_TYPEINFO_INLINE(wxObjectEventFunctor) +}; // Create a functor for the legacy events: used by Connect() inline wxObjectEventFunctor * @@ -283,40 +292,7 @@ wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType), return wxObjectEventFunctor(method, handler); } -#else // !wxEVENTS_COMPATIBILITY_2_8 - -// functor forwarding the event to anything callable (function, static method, -// generalized functor...) -template -class wxEventFunctorFunction : public wxEventFunctor -{ -public: - typedef typename EventTag::EventClass EventArg; - - wxEventFunctorFunction(Functor handler) - { - m_handler = handler; - } - - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) - { - m_handler(static_cast(event)); - } - - virtual bool Matches(const wxEventFunctor& WXUNUSED(func)) const - { - // 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: - Functor m_handler; -}; +#ifdef wxHAS_EVENT_BIND namespace wxPrivate { @@ -356,7 +332,7 @@ struct HandlerImpl { return static_cast(p); } static wxEvtHandler *ConvertToEvtHandler(T *p) { return p; } - static wxEventFunction ConvertToEvtFunction(void (T::*f)(A&)) + static wxEventFunction ConvertToEvtMethod(void (T::*f)(A&)) { return static_cast( reinterpret_cast(f)); } }; @@ -371,7 +347,7 @@ struct HandlerImpl { return NULL; } static wxEvtHandler *ConvertToEvtHandler(T *) { return NULL; } - static wxEventFunction ConvertToEvtFunction(void (T::*)(A&)) + static wxEventFunction ConvertToEvtMethod(void (T::*)(A&)) { return NULL; } }; @@ -406,6 +382,7 @@ public: wxEventFunctorMethod(void (Class::*method)(EventArg&), EventHandler *handler) + : m_handler( handler ), m_method( method ) { wxASSERT_MSG( handler || this->IsEvtHandler(), "handlers defined in non-wxEvtHandler-derived classes " @@ -415,9 +392,6 @@ public: // 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(NULL)); - - m_handler = handler; - m_method = method; } virtual void operator()(wxEvtHandler *handler, wxEvent& event) @@ -437,60 +411,183 @@ public: (realHandler->*m_method)(static_cast(event)); } - virtual bool Matches(const wxEventFunctor& func) const + virtual bool IsMatching(const wxEventFunctor& functor) const { - void * const handler = func.GetHandler(); - if ( handler && GetHandler() != handler ) + if ( wxTypeId(functor) != wxTypeId(*this) ) return false; - const wxEventFunction method = GetMethod(); - return !method || GetMethod() == method; + typedef wxEventFunctorMethod + ThisFunctor; + + // the cast is valid because wxTypeId()s matched above + const ThisFunctor& other = static_cast(functor); + + return (m_method == other.m_method || other.m_method == NULL) && + (m_handler == other.m_handler || other.m_handler == NULL); } - virtual void *GetHandler() const + virtual wxEvtHandler *GetEvtHandler() const + { return this->ConvertToEvtHandler(m_handler); } + + virtual wxEventFunction GetEvtMethod() const + { return this->ConvertToEvtMethod(m_method); } + +private: + EventHandler *m_handler; + void (Class::*m_method)(EventArg&); + + // Provide a dummy default ctor for type info purposes + wxEventFunctorMethod() { } + + typedef wxEventFunctorMethod thisClass; + WX_DECLARE_TYPEINFO_INLINE(thisClass) +}; + + +// functor forwarding the event to function (function, static method) +template +class wxEventFunctorFunction : public wxEventFunctor +{ +private: + static void CheckHandlerArgument(EventArg *) { } + +public: + // the event class associated with the given event tag + typedef typename wxPrivate::EventClassOf::type EventClass; + + wxEventFunctorFunction( void ( *handler )( EventArg & )) + : m_handler( handler ) { - return m_handler; + // 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(NULL)); } - virtual wxEventFunction GetMethod() const + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) { - return this->ConvertToEvtFunction(m_method); + // If you get an error here like "must use .* or ->* to call + // pointer-to-member function" then you probably tried to call + // Bind/Unbind with a method pointer but without a handler pointer or + // NULL as a handler e.g.: + // Unbind( wxEVT_XXX, &EventHandler::method ); + // or + // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) + m_handler(static_cast(event)); } - virtual wxEvtHandler *GetEvtHandler() const + virtual bool IsMatching(const wxEventFunctor &functor) const { - return this->ConvertToEvtHandler(m_handler); + if ( wxTypeId(functor) != wxTypeId(*this) ) + return false; + + typedef wxEventFunctorFunction ThisFunctor; + + const ThisFunctor& other = static_cast( functor ); + + return m_handler == other.m_handler; } private: - EventHandler *m_handler; - void (Class::*m_method)(EventArg&); + void (*m_handler)(EventArg&); + + // Provide a dummy default ctor for type info purposes + wxEventFunctorFunction() { } + + typedef wxEventFunctorFunction thisClass; + WX_DECLARE_TYPEINFO_INLINE(thisClass) }; +template +class wxEventFunctorFunctor : public wxEventFunctor +{ +public: + typedef typename EventTag::EventClass EventArg; + + wxEventFunctorFunctor(const Functor& handler) + : m_handler(handler), m_handlerAddr(&handler) + { } + + virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) + { + // If you get an error here like "must use '.*' or '->*' to call + // pointer-to-member function" then you probably tried to call + // Bind/Unbind with a method pointer but without a handler pointer or + // NULL as a handler e.g.: + // Unbind( wxEVT_XXX, &EventHandler::method ); + // or + // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) + m_handler(static_cast(event)); + } + + virtual bool IsMatching(const wxEventFunctor &functor) const + { + if ( wxTypeId(functor) != wxTypeId(*this) ) + return false; + + typedef wxEventFunctorFunctor FunctorThis; + + const FunctorThis& other = static_cast(functor); + + // The only reliable/portable way to compare two functors is by + // identity: + return m_handlerAddr == other.m_handlerAddr; + } + +private: + // Store a copy of the functor to prevent using/calling an already + // destroyed instance: + Functor m_handler; + + // Use the address of the original functor for comparison in IsMatching: + const void *m_handlerAddr; + + // Provide a dummy default ctor for type info purposes + wxEventFunctorFunctor() { } + + typedef wxEventFunctorFunctor thisClass; + WX_DECLARE_TYPEINFO_INLINE(thisClass) +}; + // 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 functors wrapping other functors (including functions): -template -inline wxEventFunctorFunction * -wxNewEventFunctor(const EventTag&, Functor func) +// Create functors wrapping functions: +template +inline wxEventFunctorFunction * +wxNewEventFunctor(const EventTag&, void (*func)(EventArg &)) +{ + return new wxEventFunctorFunction(func); +} + +template +inline wxEventFunctorFunction +wxMakeEventFunctor(const EventTag&, void (*func)(EventArg &)) { - return new wxEventFunctorFunction(func); + return wxEventFunctorFunction(func); } +// Create functors wrapping other functors: template -inline wxEventFunctorFunction -wxMakeEventFunctor(const EventTag&, Functor func) +inline wxEventFunctorFunctor * +wxNewEventFunctor(const EventTag&, const Functor &func) { - return wxEventFunctorFunction(func); + return new wxEventFunctorFunctor(func); } +template +inline wxEventFunctorFunctor +wxMakeEventFunctor(const EventTag&, const Functor &func) +{ + return wxEventFunctorFunctor(func); +} -// Create functors for methods: +// Create functors wrapping methods: template inline wxEventFunctorMethod * @@ -524,7 +621,7 @@ wxNewEventTableFunctor(const EventTag&, void (Class::*method)(EventArg&)) method, NULL); } -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND // many, but not all, standard event types @@ -965,7 +1062,7 @@ public: wxPropagateOnce(wxEvent& event) : m_event(event) { wxASSERT_MSG( m_event.m_propagationLevel > 0, - _T("shouldn't be used unless ShouldPropagate()!") ); + wxT("shouldn't be used unless ShouldPropagate()!") ); m_event.m_propagationLevel--; } @@ -1400,6 +1497,33 @@ private: wxEVT_HOTKEY */ +// key categories: the bit flags for IsKeyInCategory() function +// +// the enum values used may change in future version of wx +// use the named constants only, or bitwise combinations thereof +enum wxKeyCategoryFlags +{ + // arrow keys, on and off numeric keypads + WXK_CATEGORY_ARROW = 1, + + // page up and page down keys, on and off numeric keypads + WXK_CATEGORY_PAGING = 2, + + // home and end keys, on and off numeric keypads + WXK_CATEGORY_JUMP = 4, + + // tab key, on and off numeric keypads + WXK_CATEGORY_TAB = 8, + + // backspace and delete keys, on and off numeric keypads + WXK_CATEGORY_CUT = 16, + + // all keys usually used for navigation + WXK_CATEGORY_NAVIGATION = WXK_CATEGORY_ARROW | + WXK_CATEGORY_PAGING | + WXK_CATEGORY_JUMP +}; + class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent, public wxKeyboardState { @@ -1410,6 +1534,9 @@ public: // get the key code: an ASCII7 char or an element of wxKeyCode enum int GetKeyCode() const { return (int)m_keyCode; } + // returns true iff this event's key code is of a certain type + bool IsKeyInCategory(int category) const; + #if wxUSE_UNICODE // get the Unicode character corresponding to this key wxChar GetUnicodeKey() const { return m_uniChar; } @@ -1813,7 +1940,7 @@ public: // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it // doesn't make sense for wxEVT_CLOSE_WINDOW wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, - _T("this flag is for end session events only") ); + wxT("this flag is for end session events only") ); return m_loggingOff; } @@ -2626,7 +2753,10 @@ struct WXDLLIMPEXP_BASE wxEventTableEntryBase m_lastId(idLast), m_fn(fn), m_callbackUserData(data) - { } + { + wxASSERT_MSG( idLast == wxID_ANY || winid <= idLast, + "invalid IDs range: lower bound > upper bound" ); + } wxEventTableEntryBase( const wxEventTableEntryBase &entry ) : m_id( entry.m_id ), @@ -2871,7 +3001,7 @@ public: wxObject *userData = NULL, wxEvtHandler *eventSink = NULL) { - DoConnect(winid, lastId, eventType, + DoBind(winid, lastId, eventType, wxNewEventFunctor(eventType, func, eventSink), userData); } @@ -2898,7 +3028,7 @@ public: wxObject *userData = NULL, wxEvtHandler *eventSink = NULL) { - return DoDisconnect(winid, lastId, eventType, + return DoUnbind(winid, lastId, eventType, wxMakeEventFunctor(eventType, func, eventSink), userData ); } @@ -2916,16 +3046,42 @@ public: wxEvtHandler *eventSink = NULL) { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); } -#if !wxEVENTS_COMPATIBILITY_2_8 - // Bind arbitrary functor (including just a function) to an event: +#ifdef wxHAS_EVENT_BIND + // Bind functions to an event: + template + void Bind(const EventTag& eventType, + void (*function)(EventArg &), + int winid = wxID_ANY, + int lastId = wxID_ANY, + wxObject *userData = NULL) + { + DoBind(winid, lastId, eventType, + wxNewEventFunctor(eventType, function), + userData); + } + + + template + bool Unbind(const EventTag& eventType, + void (*function)(EventArg &), + int winid = wxID_ANY, + int lastId = wxID_ANY, + wxObject *userData = NULL) + { + return DoUnbind(winid, lastId, eventType, + wxMakeEventFunctor(eventType, function), + userData); + } + + // Bind functors to an event: template void Bind(const EventTag& eventType, - Functor functor, + const Functor &functor, int winid = wxID_ANY, int lastId = wxID_ANY, wxObject *userData = NULL) { - DoConnect(winid, lastId, eventType, + DoBind(winid, lastId, eventType, wxNewEventFunctor(eventType, functor), userData); } @@ -2933,12 +3089,12 @@ public: template bool Unbind(const EventTag& eventType, - Functor functor, + const Functor &functor, int winid = wxID_ANY, int lastId = wxID_ANY, wxObject *userData = NULL) { - return DoDisconnect(winid, lastId, eventType, + return DoUnbind(winid, lastId, eventType, wxMakeEventFunctor(eventType, functor), userData); } @@ -2955,7 +3111,7 @@ public: int lastId = wxID_ANY, wxObject *userData = NULL) { - DoConnect(winid, lastId, eventType, + DoBind(winid, lastId, eventType, wxNewEventFunctor(eventType, method, handler), userData); } @@ -2968,11 +3124,11 @@ public: int lastId = wxID_ANY, wxObject *userData = NULL ) { - return DoDisconnect(winid, lastId, eventType, + return DoUnbind(winid, lastId, eventType, wxMakeEventFunctor(eventType, method, handler), userData); } -#endif // !wxEVENTS_COMPATIBILITY_2_8 +#endif // wxHAS_EVENT_BIND wxList* GetDynamicEventTable() const { return m_dynamicEvents ; } @@ -3014,13 +3170,13 @@ public: private: - void DoConnect(int winid, + void DoBind(int winid, int lastId, wxEventType eventType, wxEventFunctor *func, wxObject* userData = NULL); - bool DoDisconnect(int winid, + bool DoUnbind(int winid, int lastId, wxEventType eventType, const wxEventFunctor& func, @@ -3155,13 +3311,6 @@ private: 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. // @@ -3771,17 +3920,17 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent& // (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 +#ifdef wxHAS_EVENT_BIND #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 +#else // wxHAS_EVENT_BIND + #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) +#endif // wxHAS_EVENT_BIND #if wxUSE_GUI