Added support for timer events in Motif

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6467 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index d6d6df245538e716de060bf16d16044c220717f1..28c0d776b4e1cc5d984fa5c0bdc5d351433a4559 100644 (file)
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -21,7 +21,9 @@ class WXDLLEXPORT wxTimer : public wxTimerBase
 friend void wxTimerCallback(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);
@@ -30,6 +32,8 @@ public:
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:
+    void Init();
+
     long m_id;
 
 private:

diff --git a/src/motif/timer.cpp b/src/motif/timer.cpp
index b28820804c0b41abe66f1815ed8e67fecd32c6f8..570e4186f97f8fb843a5d017fcb387ee099631e6 100644 (file)
--- a/src/motif/timer.cpp
+++ b/src/motif/timer.cpp
@@ -51,9 +51,10 @@ void wxTimerCallback (wxTimer * timer)
   timer->Notify();
 }
 
-wxTimer::wxTimer()
+void wxTimer::Init()
 {
     m_id = 0;
+    m_milli = 1000;
 }
 
 wxTimer::~wxTimer()