added a test to check how exception handling works with Win32 SEH; corrected copyright

[wxWidgets.git] / wxPython / src / _timer.i

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 1042c7f52fda0dda6a9fe58477584233a1509229..c4bd285dbe5991678e53a7890af55dd252d823fb 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -35,7 +35,14 @@ enum {
 //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 
 IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
 //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 
 IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);

-    
+
+wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
+    : wxTimer(owner, id)
+{
+    if (owner == NULL) SetOwner(this);
+}
+
+

 void wxPyTimer::Notify() {
     bool found;
     bool blocked = wxPyBeginBlockThreads();
 void wxPyTimer::Notify() {
     bool found;
     bool blocked = wxPyBeginBlockThreads();


@@ -53,10 +60,17 @@ void wxPyTimer::base_Notify() {
 
 
 
 
 
 

-%name(Timer) class wxPyTimer : public wxEvtHandler
+MustHaveApp(wxPyTimer);
+
+%rename(Timer) wxPyTimer;
+class wxPyTimer : public wxEvtHandler

 {
 public:
 {
 public:

-    %pythonAppend wxPyTimer         "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self)"
+    // Don't let the OOR or callback info hold references to the object so
+    // there won't be a reference cycle and it can clean itself up via normal
+    // Python refcounting
+    %pythonAppend wxPyTimer
+        "self._setCallbackInfo(self, Timer, 0); self._setOORInfo(self, 0)"

 
 
     // if you don't call SetOwner() or provide an owner in the contstructor
 
 
     // if you don't call SetOwner() or provide an owner in the contstructor


@@ -64,6 +78,8 @@ public:
     // notification.  If the owner is set then it will get the timer
     // notifications which can be handled with EVT_TIMER.
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
     // notification.  If the owner is set then it will get the timer
     // notifications which can be handled with EVT_TIMER.
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);

+
+    // Destructor.  

     virtual ~wxPyTimer();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1);
     virtual ~wxPyTimer();
 
     void _setCallbackInfo(PyObject* self, PyObject* _class, int incref=1);


@@ -78,7 +94,7 @@ public:
     //
     // it is now valid to call Start() multiple times: this just restarts the
     // timer if it is already running
     //
     // 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();
 
     // stop the timer
     virtual void Stop();


@@ -99,6 +115,11 @@ public:
     // return the timer ID
     int GetId() const;
 
     // return the timer ID
     int GetId() const;
 

+    %pythoncode {
+        def Destroy():
+            """NO-OP: Timers must be destroyed by normal refrence counting"""
+            pass
+    }

 };
 
 
 };
 
 


@@ -130,15 +151,16 @@ public:
 
 
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor
 
 
 // wxTimerRunner: starts the timer in its ctor, stops in the dtor

+MustHaveApp(wxTimerRunner);

 class wxTimerRunner
 {
 public:
     %nokwargs wxTimerRunner;
     wxTimerRunner(wxTimer& timer);
 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();
 
     ~wxTimerRunner();
 

-    void Start(int milli, bool oneShot = False);
+    void Start(int milli, bool oneShot = false);

 };
 
 
 };