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

prevent a reference leak when OOR objects are created

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-07-17 17:52:29 +00:00
parent 251f47d1ea
commit a77bf68f69
5 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wxPython/contrib/ogl/_oglbasic.i
View File

@@ -89,7 +89,8 @@ public:
void _setCallbackInfo(PyObject* self, PyObject* _class);
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}
%pythoncode {

3
wxPython/src/_evthandler.i
View File

@@ -69,7 +69,8 @@ public:
%extend {
void _setOORInfo(PyObject* _self) {
if (_self && _self != Py_None) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
else {
wxPyOORClientData* data = (wxPyOORClientData*)self->GetClientObject();

10
wxPython/src/_grid_rename.i
View File

@@ -14,6 +14,16 @@
%rename(GRID_VALUE_DATETIME) wxGRID_VALUE_DATETIME;
%rename(GridNoCellCoords) wxGridNoCellCoords;
%rename(GridNoCellRect) wxGridNoCellRect;
%rename(GRID_DEFAULT_NUMBER_ROWS) wxGRID_DEFAULT_NUMBER_ROWS;
%rename(GRID_DEFAULT_NUMBER_COLS) wxGRID_DEFAULT_NUMBER_COLS;
%rename(GRID_DEFAULT_ROW_HEIGHT) wxGRID_DEFAULT_ROW_HEIGHT;
%rename(GRID_DEFAULT_COL_WIDTH) wxGRID_DEFAULT_COL_WIDTH;
%rename(GRID_DEFAULT_COL_LABEL_HEIGHT) wxGRID_DEFAULT_COL_LABEL_HEIGHT;
%rename(GRID_DEFAULT_ROW_LABEL_WIDTH) wxGRID_DEFAULT_ROW_LABEL_WIDTH;
%rename(GRID_LABEL_EDGE_ZONE) wxGRID_LABEL_EDGE_ZONE;
%rename(GRID_MIN_ROW_HEIGHT) wxGRID_MIN_ROW_HEIGHT;
%rename(GRID_MIN_COL_WIDTH) wxGRID_MIN_COL_WIDTH;
%rename(GRID_DEFAULT_SCROLLBAR_WIDTH) wxGRID_DEFAULT_SCROLLBAR_WIDTH;
%rename(GridCellRenderer) wxGridCellRenderer;
%rename(PyGridCellRenderer) wxPyGridCellRenderer;
%rename(GridCellStringRenderer) wxGridCellStringRenderer;

3
wxPython/src/_sizers.i
View File

@@ -372,7 +372,8 @@ public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
DocAStr(Add,

62
wxPython/src/grid.i
View File

@@ -63,7 +63,8 @@ PyObject* wxPyMake_##TYPE(TYPE* source, bool setThisOwn) { \
wxPyOORClientData* data = (wxPyOORClientData*)source->GetClientObject(); \
if (data) { \
target = data->m_obj; \
Py_INCREF(target); \
if (target) \
Py_INCREF(target); \
} \
/* Otherwise make a new wrapper for it the old fashioned way and \
give it the OOR treatment */ \
@@ -521,28 +522,30 @@ const wxRect wxGridNoCellRect;
%mutable;
%rename(GRID_DEFAULT_NUMBER_ROWS) WXGRID_DEFAULT_NUMBER_ROWS;
%rename(GRID_DEFAULT_NUMBER_COLS) WXGRID_DEFAULT_NUMBER_COLS;
%rename(GRID_DEFAULT_ROW_HEIGHT) WXGRID_DEFAULT_ROW_HEIGHT;
%rename(GRID_DEFAULT_COL_WIDTH) WXGRID_DEFAULT_COL_WIDTH;
%rename(GRID_DEFAULT_COL_LABEL_HEIGHT) WXGRID_DEFAULT_COL_LABEL_HEIGHT;
%rename(GRID_DEFAULT_ROW_LABEL_WIDTH) WXGRID_DEFAULT_ROW_LABEL_WIDTH;
%rename(GRID_LABEL_EDGE_ZONE) WXGRID_LABEL_EDGE_ZONE;
%rename(GRID_MIN_ROW_HEIGHT) WXGRID_MIN_ROW_HEIGHT;
%rename(GRID_MIN_COL_WIDTH) WXGRID_MIN_COL_WIDTH;
%rename(GRID_DEFAULT_SCROLLBAR_WIDTH) WXGRID_DEFAULT_SCROLLBAR_WIDTH;
%{
#define wxGRID_DEFAULT_NUMBER_ROWS WXGRID_DEFAULT_NUMBER_ROWS
#define wxGRID_DEFAULT_NUMBER_COLS WXGRID_DEFAULT_NUMBER_COLS
#define wxGRID_DEFAULT_ROW_HEIGHT WXGRID_DEFAULT_ROW_HEIGHT
#define wxGRID_DEFAULT_COL_WIDTH WXGRID_DEFAULT_COL_WIDTH
#define wxGRID_DEFAULT_COL_LABEL_HEIGHT WXGRID_DEFAULT_COL_LABEL_HEIGHT
#define wxGRID_DEFAULT_ROW_LABEL_WIDTH WXGRID_DEFAULT_ROW_LABEL_WIDTH
#define wxGRID_LABEL_EDGE_ZONE WXGRID_LABEL_EDGE_ZONE
#define wxGRID_MIN_ROW_HEIGHT WXGRID_MIN_ROW_HEIGHT
#define wxGRID_MIN_COL_WIDTH WXGRID_MIN_COL_WIDTH
#define wxGRID_DEFAULT_SCROLLBAR_WIDTH WXGRID_DEFAULT_SCROLLBAR_WIDTH
%}
enum {
WXGRID_DEFAULT_NUMBER_ROWS,
WXGRID_DEFAULT_NUMBER_COLS,
WXGRID_DEFAULT_ROW_HEIGHT,
WXGRID_DEFAULT_COL_WIDTH,
WXGRID_DEFAULT_COL_LABEL_HEIGHT,
WXGRID_DEFAULT_ROW_LABEL_WIDTH,
WXGRID_LABEL_EDGE_ZONE,
WXGRID_MIN_ROW_HEIGHT,
WXGRID_MIN_COL_WIDTH,
WXGRID_DEFAULT_SCROLLBAR_WIDTH
wxGRID_DEFAULT_NUMBER_ROWS,
wxGRID_DEFAULT_NUMBER_COLS,
wxGRID_DEFAULT_ROW_HEIGHT,
wxGRID_DEFAULT_COL_WIDTH,
wxGRID_DEFAULT_COL_LABEL_HEIGHT,
wxGRID_DEFAULT_ROW_LABEL_WIDTH,
wxGRID_LABEL_EDGE_ZONE,
wxGRID_MIN_ROW_HEIGHT,
wxGRID_MIN_COL_WIDTH,
wxGRID_DEFAULT_SCROLLBAR_WIDTH
};
@@ -556,7 +559,8 @@ class wxGridCellRenderer
public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}
@@ -762,7 +766,8 @@ class wxGridCellEditor
public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}
@@ -1030,14 +1035,15 @@ public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}
%pythonAppend wxGridCellAttr "self._setOORInfo(self)"
wxGridCellAttr(wxGridCellAttr *attrDefault = NULL);
wxGridCellAttr *Clone() const;
void MergeWith(wxGridCellAttr *mergefrom);
void IncRef();
@@ -1095,7 +1101,8 @@ public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}
@@ -1156,7 +1163,8 @@ public:
%extend {
void _setOORInfo(PyObject* _self) {
self->SetClientObject(new wxPyOORClientData(_self));
if (!self->GetClientObject())
self->SetClientObject(new wxPyOORClientData(_self));
}
}