fix warnings about calling an inline function before it is defined inline

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 8955051268dd4ed237302b231052778408869e44..b0efc9d3ad305f7a884b6cfb5e4d6172f05c25af 100644 (file)
--- 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)
 
     // 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();
     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"
     #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"
     #include "wx/generic/timer.h"
 #elif defined (__WXCOCOA__)
     #include "wx/cocoa/timer.h"