X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/af49c4b8a2d3553e733e71c7dd3911881f4c1a2a..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/generic/timer.h?ds=sidebyside

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index 7e80d8c754..0ac91f51e1 100644
--- a/include/wx/generic/timer.h
+++ b/include/wx/generic/timer.h
@@ -3,7 +3,7 @@
 // Purpose:     Generic implementation of wxTimer class
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -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)
 };