X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/05adb9d2fdc40d8620730be490bf406b8e367cf8..f114b8580b980c54e7b6194fe6494a86cb833907:/include/wx/mac/timer.h?ds=sidebyside

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 1554893d8e..397edf7485 100644
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -12,7 +12,7 @@
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "timer.h"
 #endif
 
@@ -21,17 +21,13 @@
 
 class wxTimer ;
 
-typedef struct MacTimerInfo
-{
-    TMTask m_task;
-    wxMacNotifierTableRef m_table ;
-    wxTimer* m_timer ;
-} ;
+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,
@@ -40,8 +36,11 @@ public:
 
     virtual bool IsRunning() const ;
 
-    MacTimerInfo m_info;
+    MacTimerInfo* m_info;
+protected :
+	void Init();
 private:
+
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };