From b3ddc4c2ecd39b94ba5d50de458df4256fe68b36 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Garcia Date: Mon, 6 Mar 2000 00:59:31 +0000 Subject: [PATCH] Added support for timer events in Motif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/timer.h | 6 +++++- src/motif/timer.cpp | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h index d6d6df2455..28c0d776b4 100644 --- a/include/wx/motif/timer.h +++ b/include/wx/motif/timer.h @@ -21,7 +21,9 @@ class WXDLLEXPORT wxTimer : public wxTimerBase friend void wxTimerCallback(wxTimer * timer); public: - wxTimer(); + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + { Init(); } ~wxTimer(); virtual bool Start(int milliseconds = -1, bool oneShot = FALSE); @@ -30,6 +32,8 @@ public: virtual bool IsRunning() const { return m_id != 0; } protected: + void Init(); + long m_id; private: diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp index b28820804c..570e4186f9 100644 --- a/src/motif/timer.cpp +++ b/src/motif/timer.cpp @@ -51,9 +51,10 @@ void wxTimerCallback (wxTimer * timer) timer->Notify(); } -wxTimer::wxTimer() +void wxTimer::Init() { m_id = 0; + m_milli = 1000; } wxTimer::~wxTimer() -- 2.45.2