X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7722248d7510121367c9d4db7af1156197c26e82..6c3f6fe9b0ed539ff6b8be436b9a9a5e287b0620:/wxPython/src/_timer.i

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 6d669bc44f..e09e7509d0 100644
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -26,21 +26,40 @@ enum {
 
 // Timer event type
 %constant wxEventType wxEVT_TIMER;
-   
+
 
 //---------------------------------------------------------------------------
 
 
 %{
-IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
+//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
+
+IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
+    
+void wxPyTimer::Notify() {
+    bool found;
+    bool 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();
+}
+
 %}
 
 
 
+MustHaveApp(wxPyTimer);
+
 %name(Timer) class wxPyTimer : public wxEvtHandler
 {
 public:
-    %addtofunc wxPyTimer         "self._setCallbackInfo(self, Timer)"
+    %pythonAppend wxPyTimer         "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)"
+
 
     // if you don't call SetOwner() or provide an owner in the contstructor
     // then you must override Notify() inorder to receive the timer
@@ -49,12 +68,12 @@ public:
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
     virtual ~wxPyTimer();
 
-    void _setCallbackInfo(PyObject* self, PyObject* _class);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1);
 
     // 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()
@@ -78,10 +97,14 @@ public:
 
     // return True if the timer is one shot
     bool IsOneShot() const;
+
+    // return the timer ID
+    int GetId() const;
+
 };
 
 
-%pythoncode {    
+%pythoncode {
 %# For backwards compatibility with 2.4
 class PyTimer(Timer):
     def __init__(self, notify):
@@ -94,7 +117,7 @@ class PyTimer(Timer):
 
 
 EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
-                   
+
 };
 
 
@@ -109,6 +132,7 @@ public:
 
 
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
+MustHaveApp(wxTimerRunner);
 class wxTimerRunner
 {
 public:
@@ -122,3 +146,7 @@ public:
 
 
 //---------------------------------------------------------------------------
+%init %{
+    wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
+%}
+//---------------------------------------------------------------------------