Add GetOwner accessor and fix wxRTTI inheritance for wxTimer. Set the
timer as the event object in wxTimerEvents. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27196 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -34,6 +34,8 @@ enum {
|
||||
%{
|
||||
//IMP_PYCALLBACK__(wxPyTimer, wxTimer, Notify);
|
||||
|
||||
IMPLEMENT_ABSTRACT_CLASS(wxPyTimer, wxTimer);
|
||||
|
||||
void wxPyTimer::Notify() {
|
||||
bool found;
|
||||
bool blocked = wxPyBeginBlockThreads();
|
||||
@@ -54,7 +56,7 @@ void wxPyTimer::base_Notify() {
|
||||
%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
|
||||
@@ -69,7 +71,7 @@ public:
|
||||
// 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()
|
||||
@@ -141,3 +143,7 @@ public:
|
||||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
%init %{
|
||||
wxPyPtrTypeMap_Add("wxTimer", "wxPyTimer");
|
||||
%}
|
||||
//---------------------------------------------------------------------------
|
||||
|
Reference in New Issue
Block a user