Build fix for wxMSWUniv makefile driven builds. univ/setup0.h should be autoregenerat...

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

diff --git a/include/wx/gtk1/timer.h b/include/wx/gtk1/timer.h
index 91fbc1002e8e900f97503d502ba55d88f23494b5..1f78b5de53e6647821279a51f6f325015cd55f07 100644 (file)
--- a/include/wx/gtk1/timer.h
+++ b/include/wx/gtk1/timer.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,25 +7,20 @@
 // 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:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }
 {
 public:
     wxTimer() { Init(); }
     wxTimer(wxEvtHandler *owner, int id = -1) : wxTimerBase(owner, id)
         { Init(); }

-    ~wxTimer();
+    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();