Added some standard further identifiers to help with WinCE toolbars

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 1c4469e9a55b759ab98c5d1e21a5f54d4753b800..3cc7bcd76dfc08eea29b542af070f9a4e147e360 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 
 #pragma interface "timer.h"
 #endif
 


@@ -21,18 +21,13 @@
 
 class wxTimer ;
 
 
 class wxTimer ;
 

-typedef struct MacTimerInfo
-{
-    TMTask m_task;
-    wxMacNotifierTableRef m_table ;
-    wxTimer* m_timer ;
-} ;
+struct MacTimerInfo ;

 
 class WXDLLEXPORT wxTimer: public wxTimerBase
 {
 public:
 
 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,
     ~wxTimer();
 
     virtual bool Start(int milliseconds = -1,


@@ -41,9 +36,9 @@ public:
 
     virtual bool IsRunning() const ;
 
 
     virtual bool IsRunning() const ;
 

-    MacTimerInfo m_info;
+    MacTimerInfo* m_info;

 protected :
 protected :

-       void Init();
+    void Init();

 private:
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 private:
 
     DECLARE_ABSTRACT_CLASS(wxTimer)