X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/660658398148d82d492a5d1a944bc4058a082267..015fd9ef4833ec3d8b0043a1c7e448c8be4f734a:/wxPython/src/_timer.i?ds=sidebyside

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 5471ca7b26..e09e7509d0 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,16 +53,13 @@ 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)"
 
-//     %pythonAppend wxTimer
-//     "if hasattr(self, 'Notify'):
-//             print 'bound EVT_TIMER to self.Notify'
-//             self.Bind(EVT_TIMER, self.Notify)
-//             self.SetOwner(self)";
 
     // if you don't call SetOwner() or provide an owner in the contstructor
     // then you must override Notify() inorder to receive the timer
@@ -74,7 +73,7 @@ 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()
@@ -133,6 +132,7 @@ public:
 
 
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
+MustHaveApp(wxTimerRunner);
 class wxTimerRunner
 {
 public:
@@ -146,3 +146,7 @@ public:
 
 
 //---------------------------------------------------------------------------
+%init %{
+    wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
+%}
+//---------------------------------------------------------------------------