correct idle tag type; remove unneeded includes

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

diff --git a/include/wx/motif/timer.h b/include/wx/motif/timer.h
index d6d6df245538e716de060bf16d16044c220717f1..3fa435893c16a427b1f313f8fafc1cd2b7c281b7 100644 (file)
--- a/include/wx/motif/timer.h
+++ b/include/wx/motif/timer.h
@@ -1,35 +1,35 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
+// Name:        wx/motif/timer.h
 // Purpose:     wxTimer class
 // Author:      Julian Smart
 // Modified by:
 // Created:     17/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_TIMER_H_
 #define _WX_TIMER_H_
 
-#ifdef __GNUG__
-    #pragma interface "timer.h"
-#endif
-
 class WXDLLEXPORT wxTimer : public wxTimerBase
 {
-friend void wxTimerCallback(wxTimer * timer);
+    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);
+    virtual bool Start(int milliseconds = -1, bool oneShot = false);
     virtual void Stop();
 
     virtual bool IsRunning() const { return m_id != 0; }
 
 protected:
+    void Init();
+
     long m_id;
 
 private:
@@ -37,4 +37,4 @@ private:
 };
 
 #endif
-    // _WX_TIMER_H_
+// _WX_TIMER_H_