Update to Scintilla 1.48

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 1c4469e9a55b759ab98c5d1e21a5f54d4753b800..397edf7485acd2db22b896fec55e19960420dd6c 100644 (file)
--- 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,12 +21,7 @@
 
 class wxTimer ;
 
-typedef struct MacTimerInfo
-{
-    TMTask m_task;
-    wxMacNotifierTableRef m_table ;
-    wxTimer* m_timer ;
-} ;
+struct MacTimerInfo ;
 
 class WXDLLEXPORT wxTimer: public wxTimerBase
 {
@@ -41,7 +36,7 @@ public:
 
     virtual bool IsRunning() const ;
 
-    MacTimerInfo m_info;
+    MacTimerInfo* m_info;
 protected :
        void Init();
 private: