wxPrinting fix for wxMGL

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 953da997c6b6249b3f90620b669fe939d7c09412..a050d3a1c30717894bacad4d55415f904a24a6dc 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -17,48 +17,32 @@
 #endif
 
 #include "wx/object.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.
- */
-
-// Timer functions (milliseconds)
-void WXDLLEXPORT wxStartTimer();
-// Gets time since last wxStartTimer or wxGetElapsedTime
-long WXDLLEXPORT wxGetElapsedTime(bool resetTimer = TRUE);
-
-// EXPERIMENTAL: comment this out if it doesn't compile.
-bool WXDLLEXPORT wxGetLocalTime(long *timeZone, int *dstObserved);
-
-// Get number of seconds since 00:00:00 GMT, Jan 1st 1970.
-long WXDLLEXPORT wxGetCurrentTime();
-

 #endif
     // _WX_TIMER_H_
 #endif
     // _WX_TIMER_H_