Corrected assertion

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

diff --git a/include/wx/msw/timer.h b/include/wx/msw/timer.h
index 308257acba781bfb7ff4b350c1470f329b8d15ce..104a7fffb083d74b680c1a40dbb5f722b6dd7d14 100644 (file)
--- a/include/wx/msw/timer.h
+++ b/include/wx/msw/timer.h
@@ -21,7 +21,9 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 friend void wxProcessTimer(wxTimer& timer);
 
 public:
 friend void wxProcessTimer(wxTimer& timer);
 
 public:

-    wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }

     ~wxTimer();
 
     virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);
     ~wxTimer();
 
     virtual bool Start(int milliseconds = -1, bool oneShot = FALSE);


@@ -30,6 +32,8 @@ public:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:

+    void Init();
+

     long m_id;
 
 private:
     long m_id;
 
 private: