From 4c286ef633586717113cf0149f98ad1bc1683bc6 Mon Sep 17 00:00:00 2001 From: David Surovell Date: Tue, 14 Mar 2006 22:46:49 +0000 Subject: [PATCH] cleanup - expanded wxTimerBase::Init to assign all member vars git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38079 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/timer.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/include/wx/timer.h b/include/wx/timer.h index 3f25d378e9..8955051268 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -22,9 +22,6 @@ #include "wx/event.h" #include "wx/stopwatch.h" // for backwards compatibility -// ---------------------------------------------------------------------------- -// wxTimer -// ---------------------------------------------------------------------------- // more readable flags for Start(): @@ -43,7 +40,8 @@ public: // default: if you don't call SetOwner(), your only chance to get timer // notifications is to override Notify() in the derived class - wxTimerBase() { Init(); SetOwner(this); } + wxTimerBase() + { Init(); SetOwner(this); } // ctor which allows to avoid having to override Notify() in the derived // class: the owner will get timer notifications which can be handled with @@ -54,7 +52,7 @@ public: // same as ctor above void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY) { m_owner = owner; m_idTimer = timerid; } - wxEvtHandler* GetOwner() const { return m_owner; } + wxEvtHandler * GetOwner() const { return m_owner; } virtual ~wxTimerBase(); @@ -81,23 +79,22 @@ public: // return true if the timer is running virtual bool IsRunning() const = 0; - // get the (last) timer interval in the milliseconds + // return the timer ID + int GetId() const { return m_idTimer; } + + // get the (last) timer interval in milliseconds int GetInterval() const { return m_milli; } // return true if the timer is one shot bool IsOneShot() const { return m_oneShot; } - // return the timer ID - int GetId() const { return m_idTimer; } - - protected: // common part of all ctors - void Init() { m_oneShot = false; m_milli = 0; } + void Init() + { m_owner = NULL; m_idTimer = wxID_ANY; m_milli = 0; m_oneShot = false; } wxEvtHandler *m_owner; int m_idTimer; - int m_milli; // the timer interval bool m_oneShot; // true if one shot -- 2.45.2