X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e47859daebd15efcecb969e612295c868e944d79..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index a8501510db..0b9a63b082 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -33,6 +33,10 @@ #define wxTIMER_ONE_SHOT true class WXDLLIMPEXP_FWD_BASE wxTimerImpl; +class WXDLLIMPEXP_FWD_BASE wxTimerEvent; + +// timer event type +wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_TIMER, wxTimerEvent); // the interface of wxTimer class class WXDLLIMPEXP_BASE wxTimer : public wxEvtHandler @@ -109,7 +113,7 @@ protected: wxTimerImpl *m_impl; - DECLARE_NO_COPY_CLASS(wxTimer) + wxDECLARE_NO_COPY_CLASS(wxTimer); }; // ---------------------------------------------------------------------------- @@ -142,7 +146,7 @@ public: private: wxTimer& m_timer; - DECLARE_NO_COPY_CLASS(wxTimerRunner) + wxDECLARE_NO_COPY_CLASS(wxTimerRunner); }; // ---------------------------------------------------------------------------- @@ -168,6 +172,7 @@ public: // implement the base class pure virtual virtual wxEvent *Clone() const { return new wxTimerEvent(*this); } + virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_TIMER; } private: wxTimer* m_timer; @@ -178,7 +183,7 @@ private: typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); #define wxTimerEventHandler(func) \ - (wxObjectEventFunction)(wxEventFunction)wxStaticCastEvent(wxTimerEventFunction, &func) + wxEVENT_HANDLER_CAST(wxTimerEventFunction, func) #define EVT_TIMER(timerid, func) \ wx__DECLARE_EVT1(wxEVT_TIMER, timerid, wxTimerEventHandler(func))