X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..a55e4e42606a69e6c9af93a7620610d0e22d94bf:/include/wx/gtk/timer.h

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index f35a07a7f8..cb1d10e8c1 100644
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -7,8 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __GTKTIMERH__
-#define __GTKTIMERH__
+#ifndef _WX_GTK_TIMER_H_
+#define _WX_GTK_TIMER_H_
 
 //-----------------------------------------------------------------------------
 // wxTimer
@@ -20,20 +20,19 @@ public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }
-    ~wxTimer();
+    virtual ~wxTimer();
 
-    virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
+    virtual bool Start(int millisecs = -1, bool oneShot = false);
     virtual void Stop();
 
-    virtual bool IsRunning() const { return m_tag != -1; }
+    virtual bool IsRunning() const { return m_sourceId != 0; }
 
-protected:
+private:
     void Init();
 
-    int  m_tag;
+    unsigned m_sourceId;
 
-private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
-#endif // __GTKTIMERH__
+#endif // _WX_GTK_TIMER_H_