X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2d112dc2a36d7d59778353daa9f9018b3ff4008f..6028be3f39babc4530472a4139576fe318c6aa90:/wxPython/src/_timer.i diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i index 15f8abe230..b84e0db64b 100644 --- a/wxPython/src/_timer.i +++ b/wxPython/src/_timer.i @@ -34,12 +34,14 @@ enum { %{ //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify); +IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer); + void wxPyTimer::Notify() { bool found; - wxPyBeginBlockThreads(); + bool blocked = wxPyBeginBlockThreads(); if ((found = wxPyCBH_findCallback(m_myInst, "Notify"))) wxPyCBH_callCallback(m_myInst, Py_BuildValue("()")); - wxPyEndBlockThreads(); + wxPyEndBlockThreads(blocked); if (! found) wxTimer::Notify(); } @@ -51,10 +53,12 @@ void wxPyTimer::base_Notify() { +MustHaveApp(wxPyTimer); + %name(Timer) class wxPyTimer : public wxEvtHandler { public: - %pythonAppend wxPyTimer "self._setCallbackInfo(self, Timer, 0)" + %pythonAppend wxPyTimer "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)" // if you don't call SetOwner() or provide an owner in the contstructor @@ -69,14 +73,14 @@ public: // Set the owner instance that will receive the EVT_TIMER events using the // given id. void SetOwner(wxEvtHandler *owner, int id = -1); - + wxEvtHandler* GetOwner(); // start the timer: if milliseconds == -1, use the same value as for the // last Start() // // 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(); @@ -128,16 +132,21 @@ public: // wxTimerRunner: starts the timer in its ctor, stops in the dtor +MustHaveApp(wxTimerRunner); 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); }; //--------------------------------------------------------------------------- +%init %{ + wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer"); +%} +//---------------------------------------------------------------------------