X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4c286ef633586717113cf0149f98ad1bc1683bc6..1486fb5f100d096a5ce7ee820766d7a743e759da:/include/wx/timer.h?ds=sidebyside diff --git a/include/wx/timer.h b/include/wx/timer.h index 8955051268..b0efc9d3ad 100644 --- a/include/wx/timer.h +++ b/include/wx/timer.h @@ -51,7 +51,7 @@ public: // same as ctor above void SetOwner(wxEvtHandler *owner, int timerid = wxID_ANY) - { m_owner = owner; m_idTimer = timerid; } + { m_owner = owner; m_idTimer = timerid == wxID_ANY ? wxNewId() : timerid; } wxEvtHandler * GetOwner() const { return m_owner; } virtual ~wxTimerBase(); @@ -113,7 +113,7 @@ protected: #include "wx/gtk/timer.h" #elif defined(__WXGTK__) #include "wx/gtk1/timer.h" -#elif defined(__WXX11__) || defined(__WXMGL__) +#elif defined(__WXX11__) || defined(__WXMGL__) || defined(__WXDFB__) #include "wx/generic/timer.h" #elif defined (__WXCOCOA__) #include "wx/cocoa/timer.h"