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
This commit is contained in:
		@@ -22,9 +22,6 @@
 | 
				
			|||||||
#include "wx/event.h"
 | 
					#include "wx/event.h"
 | 
				
			||||||
#include "wx/stopwatch.h" // for backwards compatibility
 | 
					#include "wx/stopwatch.h" // for backwards compatibility
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					 | 
				
			||||||
// wxTimer
 | 
					 | 
				
			||||||
// ----------------------------------------------------------------------------
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// more readable flags for Start():
 | 
					// more readable flags for Start():
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -43,7 +40,8 @@ public:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    // default: if you don't call SetOwner(), your only chance to get timer
 | 
					    // default: if you don't call SetOwner(), your only chance to get timer
 | 
				
			||||||
    // notifications is to override Notify() in the derived class
 | 
					    // 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
 | 
					    // ctor which allows to avoid having to override Notify() in the derived
 | 
				
			||||||
    // class: the owner will get timer notifications which can be handled with
 | 
					    // class: the owner will get timer notifications which can be handled with
 | 
				
			||||||
@@ -54,7 +52,7 @@ public:
 | 
				
			|||||||
    // same as ctor above
 | 
					    // same as ctor above
 | 
				
			||||||
    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
 | 
					    void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY)
 | 
				
			||||||
        { m_owner = owner; m_idTimer = timerid; }
 | 
					        { m_owner = owner; m_idTimer = timerid; }
 | 
				
			||||||
    wxEvtHandler* GetOwner() const { return m_owner; }
 | 
					    wxEvtHandler * GetOwner() const { return m_owner; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    virtual ~wxTimerBase();
 | 
					    virtual ~wxTimerBase();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -81,23 +79,22 @@ public:
 | 
				
			|||||||
    // return true if the timer is running
 | 
					    // return true if the timer is running
 | 
				
			||||||
    virtual bool IsRunning() const = 0;
 | 
					    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; }
 | 
					    int GetInterval() const { return m_milli; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // return true if the timer is one shot
 | 
					    // return true if the timer is one shot
 | 
				
			||||||
    bool IsOneShot() const { return m_oneShot; }
 | 
					    bool IsOneShot() const { return m_oneShot; }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    // return the timer ID
 | 
					 | 
				
			||||||
    int GetId() const { return m_idTimer; }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
protected:
 | 
					protected:
 | 
				
			||||||
    // common part of all ctors
 | 
					    // 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;
 | 
					    wxEvtHandler *m_owner;
 | 
				
			||||||
    int     m_idTimer;
 | 
					    int     m_idTimer;
 | 
				
			||||||
 | 
					 | 
				
			||||||
    int     m_milli;        // the timer interval
 | 
					    int     m_milli;        // the timer interval
 | 
				
			||||||
    bool    m_oneShot;      // true if one shot
 | 
					    bool    m_oneShot;      // true if one shot
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user