signned/unsigned fix

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 1554893d8e0894ecfe9cc3ef6cf4d378001873b8..a050d3a1c30717894bacad4d55415f904a24a6dc 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -21,17 +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();
+       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,


@@ -40,8 +36,11 @@ public:
 
     virtual bool IsRunning() const ;
 
 
     virtual bool IsRunning() const ;
 

-    MacTimerInfo m_info;
+    MacTimerInfo* m_info;
+protected :
+       void Init();

 private:
 private:

+

     DECLARE_ABSTRACT_CLASS(wxTimer)
 };
 
     DECLARE_ABSTRACT_CLASS(wxTimer)
 };