X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/163b3ad72c6729733881e74608af586a99f43726..844cada1622b2923754493a4c8eb91b82232093e:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index 4e36b6d35f..a8501510db 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -152,25 +152,27 @@ 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); } 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&);