reSWIGged

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

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index b613bbc630f10f45268695453b00d2b83ff20380..e09e7509d037d6db899a2e2a5554c4394ce88084 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -34,6 +34,8 @@ enum {
 %{
 //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 
 %{
 //IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 

+IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
+    

 void wxPyTimer::Notify() {
     bool found;
     bool blocked = wxPyBeginBlockThreads();
 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:
 %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
 
 
     // if you don't call SetOwner() or provide an owner in the contstructor


@@ -69,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);
     // 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()
 
     // start the timer: if milliseconds == -1, use the same value as for the
     // last Start()


@@ -128,6 +132,7 @@ 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:
 class wxTimerRunner
 {
 public:


@@ -141,3 +146,7 @@ public:
 
 
 //---------------------------------------------------------------------------
 
 
 //---------------------------------------------------------------------------

+%init %{
+    wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
+%}
+//---------------------------------------------------------------------------