X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/92c6baaff2881efa626c0cd3866cb8215e95e729..a7689c49fe02c0c065facf736ab28b19f5997b7c:/include/wx/timer.h?ds=inline diff --git a/include/wx/timer.h b/include/wx/timer.h index 346b98deee..0b9a63b082 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -32,7 +32,11 @@ // only send the notification once and then stop the timer #define wxTIMER_ONE_SHOT true -class WXDLLIMPEXP_BASE wxTimerImpl; +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,14 +113,14 @@ protected: wxTimerImpl *m_impl; - DECLARE_NO_COPY_CLASS(wxTimer) + wxDECLARE_NO_COPY_CLASS(wxTimer); }; // ---------------------------------------------------------------------------- // wxTimerRunner: starts the timer in its ctor, stops in the dtor // ---------------------------------------------------------------------------- -class WXDLLEXPORT wxTimerRunner +class WXDLLIMPEXP_BASE wxTimerRunner { public: wxTimerRunner(wxTimer& timer) : m_timer(timer) { } @@ -142,7 +146,7 @@ public: private: wxTimer& m_timer; - DECLARE_NO_COPY_CLASS(wxTimerRunner) + wxDECLARE_NO_COPY_CLASS(wxTimerRunner); }; // ---------------------------------------------------------------------------- @@ -152,21 +156,26 @@ private: class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent { public: - wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid) - { - m_eventType = wxEVT_TIMER; + wxTimerEvent() + : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; } - m_interval = interval; + wxTimerEvent(wxTimer& timer) + : wxEvent(timer.GetId(), wxEVT_TIMER), + m_timer(&timer) + { + SetEventObject(timer.GetOwner()); } // accessors - int GetInterval() const { return m_interval; } + int GetInterval() const { return m_timer->GetInterval(); } + wxTimer& GetTimer() const { return *m_timer; } // implement the base class pure virtual virtual wxEvent *Clone() const { return new wxTimerEvent(*this); } + virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_TIMER; } private: - int m_interval; + wxTimer* m_timer; DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent) }; @@ -174,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))