Fixed typo in my last commit (it did break socket detection code :-( ).

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

diff --git a/include/wx/mgl/timer.h b/include/wx/mgl/timer.h
index b9b28416517a38d7a9c66a324990e4005efc9027..320496eda6029463eb8b51d7703951d591cba021 100644 (file)
--- a/include/wx/mgl/timer.h
+++ b/include/wx/mgl/timer.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
-// Purpose:
+// Purpose:     wxTimer class
 // Author:      Vaclav Slavik
 // Id:          $Id$
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -19,27 +19,31 @@
 // wxTimer
 //-----------------------------------------------------------------------------
 
-//FIXME_MGL
+class wxTimerDesc;
+
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }
-    ~wxTimer() {}
+    ~wxTimer();
 
-    virtual bool Start( int millisecs = -1, bool oneShot = FALSE ) { return TRUE; }
-    virtual void Stop() {}
+    virtual bool Start(int millisecs = -1, bool oneShot = FALSE);
+    virtual void Stop();
 
-    virtual bool IsRunning() const { return m_tag != -1; }
+    virtual bool IsRunning() const;
 
-protected:
-    void Init() {}
+    // implementation
+    static void NotifyTimers();
 
-    int  m_tag;
+protected:
+    void Init();
 
 private:
+    wxTimerDesc *m_desc;
+    
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
-#endif // __GTKTIMERH__
+#endif // __WX_TIMER_H__