move default button handling code from wxControlContainer to wxTLW (patch 1524441)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -80,7 +80,8 @@ class wxPyTimer : public wxTimer
|
||||
{
|
||||
public:
|
||||
wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
|
||||
|
||||
~wxPyTimer();
|
||||
|
||||
DEC_PYCALLBACK__(Notify);
|
||||
PYPRIVATE;
|
||||
DECLARE_ABSTRACT_CLASS(wxPyTimer)
|
||||
|
@@ -73,7 +73,7 @@ public:
|
||||
}
|
||||
}
|
||||
|
||||
%pythonAppend _setOORInfo "args[0].thisown = 0";
|
||||
%pythonAppend _setOORInfo "args[0].this.own(False)";
|
||||
%extend {
|
||||
void _setOORInfo(PyObject* _self, bool incref=true) {
|
||||
if (_self && _self != Py_None) {
|
||||
|
@@ -42,6 +42,12 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
|
||||
if (owner == NULL)
|
||||
SetOwner(this);
|
||||
}
|
||||
|
||||
wxPyTimer::~wxPyTimer()
|
||||
{
|
||||
// printf("-=* ~wxPyTimer\n");
|
||||
}
|
||||
|
||||
%}
|
||||
|
||||
|
||||
@@ -55,7 +61,7 @@ public:
|
||||
// there won't be a reference cycle and it can clean itself up via normal
|
||||
// Python refcounting
|
||||
%pythonAppend wxPyTimer
|
||||
"self._setOORInfo(self, 0);" setCallbackInfo(Timer);
|
||||
"self._setOORInfo(self,0); self.this.own(True); " 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
|
||||
|
Reference in New Issue
Block a user