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

Fix typemap for wxGridCellCoordArray

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19483 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-04 21:21:36 +00:00
parent d659a731e3
commit d0873f2b11
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
wxPython/src/grid.i
View File

@@ -1455,10 +1455,14 @@ bool wxGridCellCoords_helper(PyObject* source, wxGridCellCoords** obj) {
// Typemap to convert an array of cells coords to a list of tuples... // Typemap to convert an array of cells coords to a list of tuples...
%typemap(python, out) wxGridCellCoordsArray& { %typemap(python, out) wxGridCellCoordsArray {
$target = wxGridCellCoordsArray_helper($source); $target = wxGridCellCoordsArray_helper($source);
} }
%typemap(python, ret) wxGridCellCoordsArray {
delete $source;
}
// ...and the helper function for the above typemap. // ...and the helper function for the above typemap.
%{ %{
@@ -1801,9 +1805,9 @@ public:
bool IsInSelection( int row, int col ); bool IsInSelection( int row, int col );
// TODO: ??? bool IsInSelection( const wxGridCellCoords& coords ) // TODO: ??? bool IsInSelection( const wxGridCellCoords& coords )
const wxGridCellCoordsArray& GetSelectedCells() const; const wxGridCellCoordsArray GetSelectedCells() const;
const wxGridCellCoordsArray& GetSelectionBlockTopLeft() const; const wxGridCellCoordsArray GetSelectionBlockTopLeft() const;
const wxGridCellCoordsArray& GetSelectionBlockBottomRight() const; const wxGridCellCoordsArray GetSelectionBlockBottomRight() const;
const wxArrayInt GetSelectedRows() const; const wxArrayInt GetSelectedRows() const;
const wxArrayInt GetSelectedCols() const; const wxArrayInt GetSelectedCols() const;

18
wxPython/src/msw/grid.cpp
View File

@@ -12581,13 +12581,15 @@ static PyObject *_wrap_wxGrid_GetSelectedCells(PyObject *self, PyObject *args, P
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxGridCellCoordsArray & _result_ref = wxGrid_GetSelectedCells(_arg0); _result = new wxGridCellCoordsArray (wxGrid_GetSelectedCells(_arg0));
_result = (wxGridCellCoordsArray *) &_result_ref;
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
}{ }{
_resultobj = wxGridCellCoordsArray_helper(_result); _resultobj = wxGridCellCoordsArray_helper(_result);
}
{
delete _result;
} }
return _resultobj; return _resultobj;
} }
@@ -12612,13 +12614,15 @@ static PyObject *_wrap_wxGrid_GetSelectionBlockTopLeft(PyObject *self, PyObject
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxGridCellCoordsArray & _result_ref = wxGrid_GetSelectionBlockTopLeft(_arg0); _result = new wxGridCellCoordsArray (wxGrid_GetSelectionBlockTopLeft(_arg0));
_result = (wxGridCellCoordsArray *) &_result_ref;
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
}{ }{
_resultobj = wxGridCellCoordsArray_helper(_result); _resultobj = wxGridCellCoordsArray_helper(_result);
}
{
delete _result;
} }
return _resultobj; return _resultobj;
} }
@@ -12643,13 +12647,15 @@ static PyObject *_wrap_wxGrid_GetSelectionBlockBottomRight(PyObject *self, PyObj
} }
{ {
PyThreadState* __tstate = wxPyBeginAllowThreads(); PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxGridCellCoordsArray & _result_ref = wxGrid_GetSelectionBlockBottomRight(_arg0); _result = new wxGridCellCoordsArray (wxGrid_GetSelectionBlockBottomRight(_arg0));
_result = (wxGridCellCoordsArray *) &_result_ref;
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL; if (PyErr_Occurred()) return NULL;
}{ }{
_resultobj = wxGridCellCoordsArray_helper(_result); _resultobj = wxGridCellCoordsArray_helper(_result);
}
{
delete _result;
} }
return _resultobj; return _resultobj;
} }