added missing button state

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

diff --git a/wxPython/src/_timer.i b/wxPython/src/_timer.i
index 10aeddc278e905cae3c61a376c4653aa1b5c2d5d..70dc914acfd327d660078192d6e76aa3016e7df8 100644 (file)
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -55,7 +55,7 @@ public:
     // 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)"
+        "self._setOORInfo(self, 0);" setCallbackInfo(Timer); 
 
     // if you don't call SetOwner() or provide an owner in the ctor
     // then you must override Notify() in order to receive the timer
@@ -66,7 +66,7 @@ public:
     // Destructor.  
     virtual ~wxPyTimer();
 
-    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref = 1);
+    void _setCallbackInfo(PyObject* self, PyObject* _class, int incref = 0);
 
     // Set the owner instance that will receive the EVT_TIMER events
     // using the given id.
@@ -104,6 +104,10 @@ public:
             """NO-OP: Timers must be destroyed by normal reference counting"""
             pass
     }
+
+    %property(Id, GetId, doc="See `GetId`");
+    %property(Interval, GetInterval, doc="See `GetInterval`");
+    %property(Owner, GetOwner, SetOwner, doc="See `GetOwner` and `SetOwner`");
 };
 
 
@@ -130,6 +134,8 @@ class wxTimerEvent : public wxEvent
 public:
     wxTimerEvent(int timerid = 0, int interval = 0);
     int GetInterval() const;
+
+    %property(Interval, GetInterval, doc="See `GetInterval`");
 };