X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bbf373b3d5c8632937b4a9d5f33db7c92a1c4c0..99fbb25ba438c675f21e9db67c894ef01d166107:/wxPython/src/_timer.i diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i index 69ea2a2674..f86f692c76 100644 --- a/wxPython/src/_timer.i +++ b/wxPython/src/_timer.i @@ -32,7 +32,7 @@ enum { %{ -//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); +IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer); @@ -41,21 +41,6 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id) { if (owner == NULL) SetOwner(this); } - - -void wxPyTimer::Notify() { - bool found; - wxPyBlock_t blocked = wxPyBeginBlockThreads(); - if ((found = wxPyCBH_findCallback(m_myInst, "Notify"))) - wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(blocked); - if (! found) - wxTimer::Notify(); -} -void wxPyTimer::base_Notify() { - wxTimer::Notify(); -} - %} @@ -101,7 +86,7 @@ public: // override this in your wxTimer-derived class if you want to process timer // messages in it, use non default ctor or SetOwner() otherwise - //virtual void Notify(); + virtual void Notify(); // return True if the timer is running virtual bool IsRunning() const;