Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxTimerEvent::GetTimer()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-05-05 14:59:25 +00:00
parent 0bc58f9580
commit 2cd78b2a87
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/latex/wx/timer.tex
View File

@@ -199,3 +199,10 @@ void MyFrame::OnTimer(wxTimerEvent& event)
Returns the interval of the timer which generated this event. Returns the interval of the timer which generated this event.
\membersection{wxTimerEvent::GetTimer}\label{wxtimereventgettimer}
\constfunc{wxTimer\&}{GetTimer}{\void}
Returns the timer object which generated this event.

16
include/wx/timer.h
View File

@@ -152,23 +152,25 @@ private:
class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent class WXDLLIMPEXP_BASE wxTimerEvent : public wxEvent
{ {
public: public:
wxTimerEvent(int timerid = 0, int interval = 0) : wxEvent(timerid) wxTimerEvent(wxTimer& timer)
: wxEvent(timer.GetId(), wxEVT_TIMER),
m_timer(timer)
{ {
m_eventType = wxEVT_TIMER; SetEventObject(timer.GetOwner());
m_interval = interval;
} }
// accessors // 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 // implement the base class pure virtual
virtual wxEvent *Clone() const { return new wxTimerEvent(*this); } virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
private: private:
int m_interval; wxTimer& m_timer;
DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTimerEvent) DECLARE_ABSTRACT_CLASS(wxTimerEvent)
DECLARE_NO_ASSIGN_CLASS(wxTimerEvent)
}; };
typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&); typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);

2
src/common/timercmn.cpp
View File

@@ -39,7 +39,7 @@
// wxWin macros // wxWin macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
IMPLEMENT_DYNAMIC_CLASS(wxTimerEvent, wxEvent) IMPLEMENT_ABSTRACT_CLASS(wxTimerEvent, wxEvent)
// ============================================================================ // ============================================================================
// wxTimerBase implementation // wxTimerBase implementation

3
src/common/timerimpl.cpp
View File

@@ -47,8 +47,7 @@ void wxTimerImpl::SetOwner(wxEvtHandler *owner, int timerid)
void wxTimerImpl::SendEvent() void wxTimerImpl::SendEvent()
{ {
wxTimerEvent event(m_idTimer, m_milli); wxTimerEvent event(*m_timer);
event.SetEventObject(m_owner);
(void)m_owner->ProcessEvent(event); (void)m_owner->ProcessEvent(event);
} }