Most of FM's wxDataViewCtrl patch.

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

diff --git a/include/wx/gtk/timer.h b/include/wx/gtk/timer.h
index 6ee7767602b351efaf37117f5762a01a24d93e4b..010c6316322c9e07d50f82e96bb64475481515f0 100644 (file)
--- a/include/wx/gtk/timer.h
+++ b/include/wx/gtk/timer.h
@@ -7,25 +7,20 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

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

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #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();