X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0cb0ba509fad1fb966d4d5277ff28071d7a8477..d53c798cf954483a97b0611184b34e63cad7ed99:/include/wx/generic/timer.h

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index 3c381771a7..83a6e5c2e2 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__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "timer.h"
 #endif
 
@@ -25,7 +25,7 @@ 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();