X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d89ddefa968e2449d10e07a261d070b3fc180ab..c59abe0376cf9d488b8ea1ae49fa2858c4057cc5:/include/wx/generic/timer.h

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index efe303411c..63f0ab1a63 100644
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -11,10 +11,6 @@
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "timer.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
@@ -25,11 +21,11 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }
-    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+    wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)
         { 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;
@@ -42,7 +38,7 @@ protected:
 
 private:
     wxTimerDesc *m_desc;
-    
+
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };