Fixed OS/2 compilation problems.

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 0e7c41b2603fa3fe42f8527a28dfca7b008f4656..b5b5cfab04abffd7c631955c57ea8df9bf6588a3 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -49,9 +49,7 @@ public:
     void SetOwner(wxEvtHandler *owner, int id = -1)
         { m_owner = owner; m_idTimer = id; }
 
-#ifdef __DARWIN__
-    virtual ~wxTimerBase() { }
-#endif
+    virtual ~wxTimerBase();
 
     // working with the timer
     // ----------------------
@@ -109,8 +107,10 @@ protected:
     #include "wx/motif/timer.h"
 #elif defined(__WXGTK__)
     #include "wx/gtk/timer.h"
-#elif defined(__WXQT__)
-    #include "wx/qt/timer.h"
+#elif defined(__WXX11__)
+    #include "wx/x11/timer.h"
+#elif defined(__WXMGL__)
+    #include "wx/mgl/timer.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/timer.h"
 #elif defined(__WXPM__)
@@ -167,6 +167,9 @@ public:
     // accessors
     int GetInterval() const { return m_interval; }
 
+    // implement the base class pure virtual
+    virtual wxEvent *Clone() const { return new wxTimerEvent(*this); }
+
 private:
     int m_interval;