allow passing wx[W]CharBuffer to wx vararg templates

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

diff --git a/include/wx/timer.h b/include/wx/timer.h
index 38a746ffa9c621d2c55548976b4cb2c17ce6f12a..c79633c6c039c06d3bc353c0d964edcc83de1119 100644 (file)
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -21,6 +21,7 @@
 #include "wx/longlong.h"
 #include "wx/event.h"
 #include "wx/stopwatch.h" // for backwards compatibility
 #include "wx/longlong.h"
 #include "wx/event.h"
 #include "wx/stopwatch.h" // for backwards compatibility

+#include "wx/window.h"    // only for NewControlId()

 
 
 // more readable flags for Start():
 
 
 // more readable flags for Start():


@@ -51,8 +52,12 @@ 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 == wxID_ANY ? wxNewId() : timerid; }
-    wxEvtHandler * GetOwner() const { return m_owner; }
+    {
+        m_owner = owner;
+        m_idTimer = timerid == wxID_ANY ? wxWindow::NewControlId() : timerid;
+    }
+
+    wxEvtHandler *GetOwner() const { return m_owner; }

 
     virtual ~wxTimerBase();
 
 
     virtual ~wxTimerBase();
 


@@ -113,7 +118,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"