Added wxTLW::SetShape and implementations for wxGTK, wxMSW and an

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index e668d30bec94ea771125a332d26255bd304db86c..3cc7bcd76dfc08eea29b542af070f9a4e147e360 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -1,53 +1,48 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
 // Purpose:     wxTimer class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        timer.h
 // Purpose:     wxTimer class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "timer.h"
 #endif
 
 #include "wx/object.h"
 #pragma interface "timer.h"
 #endif
 
 #include "wx/object.h"

+#include "wx/mac/macnotfy.h"

 
 

-class WXDLLEXPORT wxTimer: public wxObject
+class wxTimer ;
+
+struct MacTimerInfo ;
+
+class WXDLLEXPORT wxTimer: public wxTimerBase

 {
 public:
 {
 public:

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

     ~wxTimer();
 
     virtual bool Start(int milliseconds = -1,
                        bool one_shot = FALSE); // Start timer
     virtual void Stop();                       // Stop timer
 
     ~wxTimer();
 
     virtual bool Start(int milliseconds = -1,
                        bool one_shot = FALSE); // Start timer
     virtual void Stop();                       // Stop timer
 

-    virtual void Notify() = 0;                 // Override this member
-
-    // Returns the current interval time (0 if stop)
-    int Interval() const { return m_milli; }; 
-    bool OneShot() const { return m_oneShot; }
-
-protected:
-    bool m_oneShot ;
-    int  m_milli ;
-    int  m_lastMilli ;
-
-    long m_id;
+    virtual bool IsRunning() const ;

 
 

+    MacTimerInfo* m_info;
+protected :
+    void Init();

 private:
 private:

+

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

-/* Note: these are implemented in common/timercmn.cpp, so need to implement them separately.
- * But you may need to modify timercmn.cpp.
- */
-

 #endif
     // _WX_TIMER_H_
 #endif
     // _WX_TIMER_H_