Add wx.Dialog.Get/SetAffirmativeId and Get/SetEscapeId

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

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 37461f1e50eed0147b072043c6b528a8d082d943..f86f692c765cf581dcf61cd0b79f7e0ad56b62d3 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -32,7 +32,7 @@ enum {
 
 
 %{
 
 
 %{

-//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
+IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);

 
 IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
 


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

-
-
-void wxPyTimer::Notify() {
-    bool found;
-    wxPyBlock_t 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();
-}
-

 %}
 
 
 %}
 
 


@@ -101,7 +86,7 @@ public:
 
     // override this in your wxTimer-derived class if you want to process timer
     // messages in it, use non default ctor or SetOwner() otherwise
 
     // 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
     virtual bool IsRunning() const;
 
     // return True if the timer is running
     virtual bool IsRunning() const;


@@ -116,7 +101,7 @@ public:
     int GetId() const;
 
     %pythoncode {
     int GetId() const;
 
     %pythoncode {

-        def Destroy():
+        def Destroy(self):

             """NO-OP: Timers must be destroyed by normal refrence counting"""
             pass
     }
             """NO-OP: Timers must be destroyed by normal refrence counting"""
             pass
     }