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

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index efe303411c..0ac91f51e1 100644
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -11,7 +11,7 @@
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 
-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "timer.h"
 #endif
 
@@ -25,11 +25,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 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 +42,7 @@ protected:
 
 private:
     wxTimerDesc *m_desc;
-    
+
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };