As per wx-dev, split the sort arrow options out to a separate parameter.

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

diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index a565eefd3d46adf5507306b53417c960c7d57221..1f78b5de53e6647821279a51f6f325015cd55f07 100644 (file)
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -1,29 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        timer.h
+// Name:        wx/gtk1/timer.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 
-#ifdef __GNUG__
-    #pragma interface "timer.h"
-#endif
-
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
-class wxTimer : public wxTimerBase
+class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase
 {
 public:
-    wxTimer();
-    ~wxTimer();
+    wxTimer() { Init(); }
+    wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
+        { Init(); }
+    virtual ~wxTimer();
 
     virtual bool Start( int millisecs = -1, bool oneShot = FALSE );
     virtual void Stop();
@@ -31,6 +28,8 @@ public:
     virtual bool IsRunning() const { return m_tag != -1; }
 
 protected:
+    void Init();
+
     int  m_tag;
 
 private: