Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move default button handling code from wxControlContainer to wxTLW (patch 1524441)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43595 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-07-25 01:31:13 +00:00
parent 7cc4466989
commit b7681018cb
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wxPython/include/wx/wxPython/pyclasses.h
View File

@@ -80,7 +80,8 @@ class wxPyTimer : public wxTimer
{ {
public: public:
wxPyTimer(wxEvtHandler *owner=NULL, int id = -1); wxPyTimer(wxEvtHandler *owner=NULL, int id = -1);
~wxPyTimer();
DEC_PYCALLBACK__(Notify); DEC_PYCALLBACK__(Notify);
PYPRIVATE; PYPRIVATE;
DECLARE_ABSTRACT_CLASS(wxPyTimer) DECLARE_ABSTRACT_CLASS(wxPyTimer)

2
wxPython/src/_evthandler.i
View File

@@ -73,7 +73,7 @@ public:
} }
} }
%pythonAppend _setOORInfo "args[0].thisown = 0"; %pythonAppend _setOORInfo "args[0].this.own(False)";
%extend { %extend {
void _setOORInfo(PyObject* _self, bool incref=true) { void _setOORInfo(PyObject* _self, bool incref=true) {
if (_self && _self != Py_None) { if (_self && _self != Py_None) {

8
wxPython/src/_timer.i
View File

@@ -42,6 +42,12 @@ wxPyTimer::wxPyTimer(wxEvtHandler *owner, int id)
if (owner == NULL) if (owner == NULL)
SetOwner(this); 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 // there won't be a reference cycle and it can clean itself up via normal
// Python refcounting // Python refcounting
%pythonAppend wxPyTimer %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 // if you don't call SetOwner() or provide an owner in the ctor
// then you must override Notify() in order to receive the timer // then you must override Notify() in order to receive the timer