A little different fix for how to delay the call to __wxCleanup

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

diff --git a/include/wx/mgl/timer.h b/include/wx/mgl/timer.h
index 36142afcd23a19c222a6affa12d7a3ac6efa5c13..680fc17e69e3c5f15fed66dfb75c210b9b17a5a0 100644 (file)
--- a/include/wx/mgl/timer.h
+++ b/include/wx/mgl/timer.h
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h

-// Purpose:
+// Purpose:     wxTimer class

 // Author:      Vaclav Slavik
 // Id:          $Id$
 // Author:      Vaclav Slavik
 // Id:          $Id$

-// Copyright:   (c) 2001 Vaclav Slavik
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -19,27 +19,31 @@
 // wxTimer
 //-----------------------------------------------------------------------------
 
 // wxTimer
 //-----------------------------------------------------------------------------
 

-//FIXME_MGL
+class wxTimerDesc;
+

 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }
 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 ) {}
-    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:
 
 private:

+    wxTimerDesc *m_desc;
+    

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

-#endif // __GTKTIMERH__
+#endif // __WX_TIMER_H__