Added possibility of 2-step initialisation, and wxWIZARD_EX_HELPBUTTON style.

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

diff --git a/include/wx/mac/timer.h b/include/wx/mac/timer.h
index 1554893d8e0894ecfe9cc3ef6cf4d378001873b8..1c4469e9a55b759ab98c5d1e21a5f54d4753b800 100644 (file)
--- a/include/wx/mac/timer.h
+++ b/include/wx/mac/timer.h
@@ -31,7 +31,8 @@ typedef 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,


@@ -41,7 +42,10 @@ public:
     virtual bool IsRunning() const ;
 
     MacTimerInfo m_info;
     virtual bool IsRunning() const ;
 
     MacTimerInfo m_info;

+protected :
+       void Init();

 private:
 private:

+

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