clean ups to wxX11+wxUniv handling

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

diff --git a/include/wx/x11/timer.h b/include/wx/x11/timer.h
index 2476a768e2bcf701c0b6def0cfabea58a6d228ab..680fc17e69e3c5f15fed66dfb75c210b9b17a5a0 100644 (file)
--- a/include/wx/x11/timer.h
+++ b/include/wx/x11/timer.h
@@ -1,44 +1,49 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
 // Purpose:     wxTimer class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Author:      Vaclav Slavik
+// Id:          $Id$
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_TIMER_H_
-#define _WX_TIMER_H_
+
+#ifndef __WX_TIMER_H__
+#define __WX_TIMER_H__
 
 #ifdef __GNUG__
-#pragma interface "timer.h"
+    #pragma interface "timer.h"
 #endif
 
+//-----------------------------------------------------------------------------
+// wxTimer
+//-----------------------------------------------------------------------------
+
+class wxTimerDesc;
+
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
-    friend void wxTimerCallback(wxTimer * timer);
-    
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
-    { Init(); }
+        { Init(); }
     ~wxTimer();
-    
-    virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
+
+    virtual bool Start(int millisecs = -1, bool oneShot = FALSE);
     virtual void Stop();
-    
-    virtual bool IsRunning() const { return m_id != 0; }
-    
+
+    virtual bool IsRunning() const;
+
+    // implementation
+    static void NotifyTimers();
+
 protected:
     void Init();
-    
-    long m_id;
-    
+
 private:
-    DECLARE_DYNAMIC_CLASS(wxTimer)
+    wxTimerDesc *m_desc;
+    
+    DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
-#endif
-// _WX_TIMER_H_
+#endif // __WX_TIMER_H__