X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0599ea91951caa2cda364498ea844be593b8a2a..9804c4d95c3c8abb492e24f5f7e989016fee53f1:/include/wx/motif/timer.h?ds=sidebyside diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h index 5091501304..add463502d 100644 --- a/include/wx/motif/timer.h +++ b/include/wx/motif/timer.h @@ -1,48 +1,40 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.h +// Name: wx/motif/timer.h // Purpose: wxTimer class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TIMER_H_ #define _WX_TIMER_H_ -#ifdef __GNUG__ -#pragma interface "timer.h" -#endif - -#include "wx/object.h" - -class WXDLLEXPORT wxTimer: public wxObject +class WXDLLEXPORT wxTimer : public wxTimerBase { - DECLARE_DYNAMIC_CLASS(wxTimer) + friend void wxTimerCallback(wxTimer * timer); - friend void wxTimerCallback (wxTimer * timer); +public: + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + { Init(); } + virtual ~wxTimer(); - public: - wxTimer(); - ~wxTimer(); - virtual bool Start(int milliseconds = -1,bool one_shot = FALSE); // Start timer - virtual void Stop(); // Stop timer - virtual void Notify() = 0; // Override this member - inline int Interval() { return m_milli ; }; // Returns the current interval time (0 if stop) + virtual bool Start(int milliseconds = -1, bool oneShot = false); + virtual void Stop(); + + virtual bool IsRunning() const { return m_id != 0; } protected: - bool m_oneShot ; - int m_milli ; - int m_lastMilli ; - long m_id; + void Init(); -}; + long m_id; -/* Note: these are implemented in common/timercmn.cpp, so need to implement them separately. - * But you may need to modify timercmn.cpp. - */ +private: + DECLARE_DYNAMIC_CLASS(wxTimer) +}; #endif - // _WX_TIMER_H_ +// _WX_TIMER_H_