moved duplicated wxRegionContain definitions to wx/region.h

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

diff --git a/include/wx/generic/timer.h b/include/wx/generic/timer.h
index 3c381771a7ac4da16c12b88e8e9de5c6266e9355..e184a1ea16d79310f85c2962abfcb0bfba8111e3 100644 (file)
--- 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$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -11,10 +11,6 @@
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 
 #ifndef __WX_TIMER_H__
 #define __WX_TIMER_H__
 

-#ifdef __GNUG__
-    #pragma interface "timer.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------


@@ -25,11 +21,11 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }
 {
 public:
     wxTimer() { Init(); }

-    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+    wxTimer(wxEvtHandler *owner, int timerid = -1) : wxTimerBase(owner, timerid)

         { Init(); }
     ~wxTimer();
 
         { 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;
     virtual void Stop();
 
     virtual bool IsRunning() const;


@@ -42,7 +38,7 @@ protected:
 
 private:
     wxTimerDesc *m_desc;
 
 private:
     wxTimerDesc *m_desc;

-    
+

     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };