X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab1f7d2aa9cb1857cf87e105ebbd36a92676bbde..46ae103b9f08fc4e447d16a6a92b03cf55ee3189:/wxPython/src/_timer.i?ds=sidebyside diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i index e09e7509d0..69ea2a2674 100644 --- a/wxPython/src/_timer.i +++ b/wxPython/src/_timer.i @@ -35,10 +35,17 @@ enum { //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer); - + +wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id) + : wxTimer(owner, id) +{ + if (owner == NULL) SetOwner(this); +} + + 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); @@ -55,10 +62,15 @@ void wxPyTimer::base_Notify() { MustHaveApp(wxPyTimer); -%name(Timer) class wxPyTimer : public wxEvtHandler +%rename(Timer) wxPyTimer; +class wxPyTimer : public wxEvtHandler { public: - %pythonAppend wxPyTimer "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)" + // Don't let the OOR or callback info hold references to the object so + // there won't be a reference cycle and it can clean itself up via normal + // Python refcounting + %pythonAppend wxPyTimer + "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self, 0)" // if you don't call SetOwner() or provide an owner in the contstructor @@ -66,6 +78,8 @@ public: // notification. If the owner is set then it will get the timer // notifications which can be handled with EVT_TIMER. wxPyTimer(wxEvtHandler *owner=NULL, int id = -1); + + // Destructor. virtual ~wxPyTimer(); void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1); @@ -80,7 +94,7 @@ public: // // it is now valid to call Start() multiple times: this just restarts the // timer if it is already running - virtual bool Start(int milliseconds = -1, bool oneShot = False); + virtual bool Start(int milliseconds = -1, bool oneShot = false); // stop the timer virtual void Stop(); @@ -101,6 +115,11 @@ public: // return the timer ID int GetId() const; + %pythoncode { + def Destroy(self): + """NO-OP: Timers must be destroyed by normal refrence counting""" + pass + } }; @@ -138,10 +157,10 @@ class wxTimerRunner public: %nokwargs wxTimerRunner; wxTimerRunner(wxTimer& timer); - wxTimerRunner(wxTimer& timer, int milli, bool oneShot = False); + wxTimerRunner(wxTimer& timer, int milli, bool oneShot = false); ~wxTimerRunner(); - void Start(int milli, bool oneShot = False); + void Start(int milli, bool oneShot = false); };