X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..d642db66a5efc82d374b813022c72ba88bc50839:/include/wx/timer.h?ds=sidebyside diff --git a/include/wx/timer.h b/include/wx/timer.h index 8c6e01625b..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,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,31 +156,34 @@ private: class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent { public: + wxTimerEvent() + : wxEvent(wxID_ANY, wxEVT_TIMER) { m_timer=NULL; } + wxTimerEvent(wxTimer& timer) : wxEvent(timer.GetId(), wxEVT_TIMER), - m_timer(timer) + m_timer(&timer) { SetEventObject(timer.GetOwner()); } // accessors - int GetInterval() const { return m_timer.GetInterval(); } - wxTimer& GetTimer() const { return m_timer; } + 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: - wxTimer& m_timer; + wxTimer* m_timer; - DECLARE_ABSTRACT_CLASS(wxTimerEvent) - DECLARE_NO_ASSIGN_CLASS(wxTimerEvent) + DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent) }; 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))