X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/acd15a3fa015caf2d1e3213a7694b05c92d5b49c..bc55104d9ab0b0b835644f17a152b4fbbfa8c7b9:/include/wx/timer.h diff --git a/include/wx/timer.h b/include/wx/timer.h index f835029b3c..8cf9cbd482 100644 --- 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,8 @@ protected: #include "wx/motif/timer.h" #elif defined(__WXGTK__) #include "wx/gtk/timer.h" -#elif defined(__WXMGL__) - #include "wx/mgl/timer.h" +#elif defined(__WXX11__) || defined(__WXMGL__) + #include "wx/generic/timer.h" #elif defined(__WXMAC__) #include "wx/mac/timer.h" #elif defined(__WXPM__)