wxMSWUniv wxWindowMSW vs. wxWindow fix.

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 9a1abc11c272ac1ae0156a988bbd73df851ea5a0..5d006be202fcc6669609694909695f1df3b4f92d 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -1,53 +1,41 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

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

-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "timer.h"

 #endif
 
 #endif
 

-#include "wx/defs.h"
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// derived classes
-//-----------------------------------------------------------------------------
-
-class wxTimer;
-

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

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

 {
 public:
 {
 public:

-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }

     ~wxTimer();
 
     ~wxTimer();
 

-    int Interval() const { return m_time; }
-
-    bool OneShot() const { return m_oneShot; }
-

     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)