X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0470b1e6fe7a49bb87756006ef9fc232e3dbaaf8..8120bbc9166a16f95c03d0ee50974117429be9e0:/include/wx/gtk/timer.h diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h index a565eefd3d..010c631632 100644 --- a/include/wx/gtk/timer.h +++ b/include/wx/gtk/timer.h @@ -1,29 +1,26 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKTIMERH__ #define __GTKTIMERH__ -#ifdef __GNUG__ - #pragma interface "timer.h" -#endif - //----------------------------------------------------------------------------- // wxTimer //----------------------------------------------------------------------------- -class wxTimer : public wxTimerBase +class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase { public: - wxTimer(); - ~wxTimer(); + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + { Init(); } + virtual ~wxTimer(); virtual bool Start( int millisecs = -1, bool oneShot = FALSE ); virtual void Stop(); @@ -31,6 +28,8 @@ public: virtual bool IsRunning() const { return m_tag != -1; } protected: + void Init(); + int m_tag; private: