Updated layout test

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

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index ad771cebd389e5602dc52e5aaf93506dae5ef079..b613bbc630f10f45268695453b00d2b83ff20380 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -26,13 +26,27 @@ enum {
 
 // Timer event type
 %constant wxEventType wxEVT_TIMER;
 
 // Timer event type
 %constant wxEventType wxEVT_TIMER;

-   
+

 
 //---------------------------------------------------------------------------
 
 
 %{
 
 //---------------------------------------------------------------------------
 
 
 %{

-IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
+//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
+
+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();
+}
+

 %}
 
 
 %}
 
 


@@ -40,6 +54,8 @@ IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
 %name(Timer) class wxPyTimer : public wxEvtHandler
 {
 public:
 %name(Timer) class wxPyTimer : public wxEvtHandler
 {
 public:

+    %pythonAppend wxPyTimer         "self._setCallbackInfo(self, Timer, 0)"
+

 
     // if you don't call SetOwner() or provide an owner in the contstructor
     // then you must override Notify() inorder to receive the timer
 
     // if you don't call SetOwner() or provide an owner in the contstructor
     // then you must override Notify() inorder to receive the timer


@@ -48,6 +64,8 @@ public:
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
     virtual ~wxPyTimer();
 
     wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
     virtual ~wxPyTimer();
 

+    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);
     // Set the owner instance that will receive the EVT_TIMER events using the
     // given id.
     void SetOwner(wxEvtHandler *owner, int id = -1);


@@ -58,27 +76,31 @@ 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();
 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise
 
     // stop the timer
     virtual void Stop();
 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise

-    virtual void Notify();
+    //virtual void Notify();

 
 

-    // return TRUE if the timer is running
+    // return True if the timer is running

     virtual bool IsRunning() const;
 
     // get the (last) timer interval in the milliseconds
     int GetInterval() const;
 
     virtual bool IsRunning() const;
 
     // get the (last) timer interval in the milliseconds
     int GetInterval() const;
 

-    // return TRUE if the timer is one shot
+    // return True if the timer is one shot

     bool IsOneShot() const;
     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):
 %# For backwards compatibility with 2.4
 class PyTimer(Timer):
     def __init__(self, notify):


@@ -91,7 +113,7 @@ class PyTimer(Timer):
 
 
 EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
 
 
 EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )

-                   
+

 };
 
 
 };
 
 


@@ -111,10 +133,10 @@ class wxTimerRunner
 public:
     %nokwargs wxTimerRunner;
     wxTimerRunner(wxTimer& timer);
 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);

 };
 
 
 };