Compile fix for the version of VC8 included in the 2003 PSDK.

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index a565eefd3d46adf5507306b53417c960c7d57221..010c6316322c9e07d50f82e96bb64475481515f0 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -1,29 +1,26 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        timer.h
+// Name:        wx/gtk/timer.h

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 
 #ifndef __GTKTIMERH__
 #define __GTKTIMERH__
 

-#ifdef __GNUG__
-    #pragma interface "timer.h"
-#endif
-

 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // wxTimer
 //-----------------------------------------------------------------------------
 

-class wxTimer : public wxTimerBase
+class WXDLLIMPEXP_CORE wxTimer : public wxTimerBase

 {
 public:
 {
 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();
 
     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:
     virtual bool IsRunning() const { return m_tag != -1; }
 
 protected:

+    void Init();
+

     int  m_tag;
 
 private:
     int  m_tag;
 
 private: