Forward port recent changes on the 2.8 branch to HEAD

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2007-05-16 23:39:42 +00:00
parent f6342fb5e6
commit 0b0849b5a5
87 changed files with 3807 additions and 1586 deletions
--- a/wxPython/src/_timer.i
+++ b/wxPython/src/_timer.i
@@ -140,8 +140,10 @@ class wxTimerEvent : public wxEvent
 public:
    wxTimerEvent(int timerid = 0, int interval = 0);
    int GetInterval() const;
-
+    wxTimer& GetTimer() const;
+    
    %property(Interval, GetInterval, doc="See `GetInterval`");
+    %property(Timer, GetTimer);
 };