X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da32eb53cbe7947f3f4599d7b6b5caa21a68d27f..4e819f106b95b247b5f4911fab2f59ada1f94290:/wxPython/src/_timer.i

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index b613bbc630..b84e0db64b 100644
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -34,6 +34,8 @@ enum {
 %{
 //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 
+IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
+    
 void wxPyTimer::Notify() {
     bool found;
     bool blocked = wxPyBeginBlockThreads();
@@ -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");
+%}
+//---------------------------------------------------------------------------