Undid last commit and restored bool argument to wxFrame::DoGiveHelp() as

[wxWidgets.git] / include / wx / gtk / timer.h

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index a93dbbe62e1764ba79f2b71cff126f526120144a..cb1d10e8c1d7790a681b2f787c6fd8f9975a0121 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -7,13 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
-#ifndef __GTKTIMERH__
-#define __GTKTIMERH__
-
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "timer.h"
-#endif
+#ifndef _WX_GTK_TIMER_H_
+#define _WX_GTK_TIMER_H_
 
 //-----------------------------------------------------------------------------
 // wxTimer
@@ -25,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_