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

Allow the OOR reference to be saved without doing an INCREF. This

Browse Source 
solves the circular reference problem with wx.Timer.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31095 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-20 22:50:29 +00:00
parent 56a52e9094
commit 94fd5e4dc1
6 changed files with 65 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wxPython/include/wx/wxPython/wxPython_int.h
View File

@@ -467,12 +467,14 @@ public:
// A wxClientData that holds a refernece to a Python object
class wxPyClientData : public wxClientData {
public:
wxPyClientData(PyObject* obj) {
wxPyClientData(PyObject* obj, bool incref=true) {
m_obj = obj;
Py_INCREF(m_obj);
m_incRef = incref;
if (incref)
Py_INCREF(m_obj);
}
~wxPyClientData() {
#ifdef wxPyUSE_EXPORTED_API
wxPyGetCoreAPIPtr()->p_wxPyClientData_dtor(this);
#else
@@ -480,6 +482,7 @@ public:
#endif
}
PyObject* m_obj;
bool m_incRef;
};
@@ -487,10 +490,10 @@ public:
// OOR magic on the Python Object.
class wxPyOORClientData : public wxPyClientData {
public:
wxPyOORClientData(PyObject* obj)
: wxPyClientData(obj) {}
wxPyOORClientData(PyObject* obj, bool incref=true)
: wxPyClientData(obj, incref) {}
~wxPyOORClientData() {
#ifdef wxPyUSE_EXPORTED_API
wxPyGetCoreAPIPtr()->p_wxPyOORClientData_dtor(this);
#else