X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/94fd5e4dc14c5de8a0a787eda125987616ace638..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/src/_timer.i

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 910a3864ca..69ea2a2674 100644
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -45,7 +45,7 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
 
 void wxPyTimer::Notify() {
     bool found;
-    bool blocked = wxPyBeginBlockThreads();
+    wxPyBlock_t blocked = wxPyBeginBlockThreads();
     if ((found = wxPyCBH_findCallback(m_myInst, "Notify")))
         wxPyCBH_callCallback(m_myInst, Py_BuildValue("()"));
     wxPyEndBlockThreads(blocked);
@@ -62,7 +62,8 @@ void wxPyTimer::base_Notify() {
 
 MustHaveApp(wxPyTimer);
 
-%name(Timer) class wxPyTimer : public wxEvtHandler
+%rename(Timer) wxPyTimer;
+class wxPyTimer : public wxEvtHandler
 {
 public:
     // Don't let the OOR or callback info hold references to the object so
@@ -115,7 +116,7 @@ public:
     int GetId() const;
 
     %pythoncode {
-        def Destroy():
+        def Destroy(self):
             """NO-OP: Timers must be destroyed by normal refrence counting"""
             pass
     }