X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..158b668823e14d9b42c9e7fe0281d35924192c68:/include/wx/mac/timer.h

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 0f656dae8f..397edf7485 100644
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -12,36 +12,35 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #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:
-    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
 
-    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:
+
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };