X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/82a5f02c861e8d57ba8255a9553b941118ad4520..1b62f00d8e3ec5437ab780cb3d73d299cc61e20c:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index 802544a91b..51432d1610 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -49,6 +49,10 @@ public: void SetOwner(wxEvtHandler *owner, int id = -1) { m_owner = owner; m_idTimer = id; } +#ifdef __WXMAC_X__ + virtual ~wxTimerBase() {} // Added min for Mac X +#endif + // working with the timer // ---------------------- @@ -172,7 +176,7 @@ private: typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); #define EVT_TIMER(id, func) \ - wxEventTableEntry( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL), + DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL), #endif // wxUSE_GUI