X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/gtk1/timer.h diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h index 80e302758b..91fbc1002e 100644 --- a/include/wx/gtk1/timer.h +++ b/include/wx/gtk1/timer.h @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: timer.h +// Name: wx/gtk/timer.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,41 +12,30 @@ #define __GTKTIMERH__ #ifdef __GNUG__ -#pragma interface + #pragma interface "timer.h" #endif -#include "wx/defs.h" -#include "wx/object.h" - -//----------------------------------------------------------------------------- -// derived classes -//----------------------------------------------------------------------------- - -class wxTimer; - //----------------------------------------------------------------------------- // wxTimer //----------------------------------------------------------------------------- -class wxTimer: public wxObject +class wxTimer : public wxTimerBase { public: - wxTimer(); + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + { Init(); } ~wxTimer(); - int Interval() const { return m_time; } - - bool OneShot() const { return m_oneShot; } - virtual bool Start( int millisecs = -1, bool oneShot = FALSE ); virtual void Stop(); - virtual void Notify() = 0; // override this + virtual bool IsRunning() const { return m_tag != -1; } protected: + void Init(); + int m_tag; - int m_time; - bool m_oneShot; private: DECLARE_ABSTRACT_CLASS(wxTimer)