renamed wxRect::Inside() to wxRect::Contains(), wxRect::Inside(wxRect) is too confusing

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

diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index 80e302758b896857c21216490701f73956c82a45..1f78b5de53e6647821279a51f6f325015cd55f07 100644 (file)
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -1,52 +1,36 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.h
+// Name:        wx/gtk1/timer.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 

-#ifdef __GNUG__
-#pragma interface
-#endif
-
-#include "wx/defs.h"
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// derived classes
-//-----------------------------------------------------------------------------
-
-class wxTimer;
-

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

-class wxTimer: public wxObject
+class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase

 {
 public:
 {
 public:

-    wxTimer();
-    ~wxTimer();
-
-    int Interval() const { return m_time; }
-
-    bool OneShot() const { return m_oneShot; }
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }
+    virtual ~wxTimer();

 
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
     virtual void Stop();
 
 
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
     virtual void Stop();
 

-    virtual void Notify() = 0;  // override this
+    virtual bool IsRunning() const { return m_tag != -1; }

 
 protected:
 
 protected:

+    void Init();
+

     int  m_tag;
     int  m_tag;

-    int  m_time;
-    bool m_oneShot;

 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)
 
 private:
     DECLARE_ABSTRACT_CLASS(wxTimer)