added fix for MSL under Win32 (by Steve Hartwell)

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 821c03b30d6961c9aff00dd04392d102d30bee56..5d006be202fcc6669609694909695f1df3b4f92d 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -1,53 +1,44 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
+// Name:        wx/gtk/timer.h
 // 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__
 
-#ifdef __GNUG__
-#pragma interface
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
+    #pragma interface "timer.h"
 #endif
 
-#include "wx/defs.h"
-#include "wx/object.h"
-
-//-----------------------------------------------------------------------------
-// derived classes
-//-----------------------------------------------------------------------------
-
-class wxTimer;
-
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
-class wxTimer: public wxObject
+class wxTimer : public wxTimerBase
 {
-  DECLARE_DYNAMIC_CLASS(wxTimer)
-
-  public:
-
-    wxTimer(void);
-    ~wxTimer(void);
-    int Interval(void);
-    bool OneShot(void);
-    virtual void Notify(void);
-    void Start( int millisecs = -1, bool oneShot = FALSE );
-    void Stop(void);
-    
-  private:
-  
+public:
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }
+    ~wxTimer();
+
+    virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
+    virtual void Stop();
+
+    virtual bool IsRunning() const { return m_tag != -1; }
+
+protected:
+    void Init();
+
     int  m_tag;
-    int  m_time;
-    bool m_oneShot;
+
+private:
+    DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
 #endif // __GTKTIMERH__