X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bdc5dd6f391db63b7baae66ce5363f35e046af6..33ebfc3b9b542e2cefcab456e47a101311b74697:/include/wx/timer.h

diff --git a/include/wx/timer.h b/include/wx/timer.h
index a16209c387..faa3133c39 100644
--- a/include/wx/timer.h
+++ b/include/wx/timer.h
@@ -6,7 +6,7 @@
 //              Guillermo Rodriguez (global clean up)
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -58,6 +58,7 @@ public:
     // same as ctor above
     void SetOwner(wxEvtHandler *owner, int timerid = -1)
         { m_owner = owner; m_idTimer = timerid; }
+    wxEvtHandler* GetOwner() const { return m_owner; }
 
     virtual ~wxTimerBase();
 
@@ -187,7 +188,7 @@ private:
 typedef void (wxEvtHandler::*wxTimerEventFunction)(wxTimerEvent&);
 
 #define EVT_TIMER(timerid, func) \
-    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, -1, (wxObjectEventFunction) (wxEventFunction) (wxTimerEventFunction) & func, NULL),
+    DECLARE_EVENT_TABLE_ENTRY( wxEVT_TIMER, timerid, -1, (wxObjectEventFunction) (wxEventFunction)  wxStaticCastEvent( wxTimerEventFunction, & func ), NULL),
 
 #endif // wxUSE_GUI && wxUSE_TIMER