X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0470b1e6fe7a49bb87756006ef9fc232e3dbaaf8..01526d4f6cd7dd242e561aa24066f8ca0290a9ac:/include/wx/gtk1/timer.h?ds=sidebyside diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h index a565eefd3d..5d006be202 100644 --- a/include/wx/gtk1/timer.h +++ b/include/wx/gtk1/timer.h @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// 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__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "timer.h" #endif @@ -22,7 +22,9 @@ class wxTimer : public wxTimerBase { public: - wxTimer(); + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) + { Init(); } ~wxTimer(); virtual bool Start( int millisecs = -1, bool oneShot = FALSE ); @@ -31,6 +33,8 @@ public: virtual bool IsRunning() const { return m_tag != -1; } protected: + void Init(); + int m_tag; private: