X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d015713e787da8241e92ff86ee2e911868b8024c..75799719334c85392638ce5c7d0e90a8b74b7e5a:/include/wx/mac/timer.h diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h index 1c4469e9a5..3cc7bcd76d 100644 --- a/include/wx/mac/timer.h +++ b/include/wx/mac/timer.h @@ -1,18 +1,18 @@ ///////////////////////////////////////////////////////////////////////////// // Name: timer.h // Purpose: wxTimer class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_TIMER_H_ #define _WX_TIMER_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "timer.h" #endif @@ -21,18 +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() { Init(); } - wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } + wxTimer() { Init(); } + wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id) { Init(); } ~wxTimer(); virtual bool Start(int milliseconds = -1, @@ -41,9 +36,9 @@ public: virtual bool IsRunning() const ; - MacTimerInfo m_info; + MacTimerInfo* m_info; protected : - void Init(); + void Init(); private: DECLARE_ABSTRACT_CLASS(wxTimer)