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

Get[First|Next]Child need to actually create a new itemid if we want

Browse Source 
the proxy to own it.

Also switch to just "void*" instead of the typedef to avoid confusing swig.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-01-27 02:30:05 +00:00
parent c15ffb3bf5
commit 5d895c0bcd
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wxPython/src/_treectrl.i
View File

@@ -82,7 +82,6 @@ enum {
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
%newgroup %newgroup
typedef void *wxTreeItemIdValue;
// wxTreeItemId identifies an element of the tree. In this implementation, it's // wxTreeItemId identifies an element of the tree. In this implementation, it's
// just a trivial wrapper around Win32 HTREEITEM or a pointer to some private // just a trivial wrapper around Win32 HTREEITEM or a pointer to some private
@@ -108,7 +107,7 @@ public:
} }
} }
wxTreeItemIdValue m_pItem; void* m_pItem;
%pythoncode { %pythoncode {
@@ -534,12 +533,12 @@ public:
// opaque "cookie" value that should be passed to GetNextChild in // opaque "cookie" value that should be passed to GetNextChild in
// order to continue the search. // order to continue the search.
PyObject* GetFirstChild(const wxTreeItemId& item) { PyObject* GetFirstChild(const wxTreeItemId& item) {
wxTreeItemIdValue cookie = 0; void* cookie = 0;
wxTreeItemId ritem = self->GetFirstChild(item, cookie); wxTreeItemId* ritem = new wxTreeItemId(self->GetFirstChild(item, cookie));
wxPyBeginBlockThreads(); wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True));
PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
wxPyEndBlockThreads(); wxPyEndBlockThreads();
return tup; return tup;
} }
@@ -549,12 +548,12 @@ public:
// value returned from GetFirstChild or the previous GetNextChild. // value returned from GetFirstChild or the previous GetNextChild.
// Returns a wxTreeItemId and an opaque "cookie" value that should be // Returns a wxTreeItemId and an opaque "cookie" value that should be
// passed to GetNextChild in order to continue the search. // passed to GetNextChild in order to continue the search.
PyObject* GetNextChild(const wxTreeItemId& item, wxTreeItemIdValue& cookie) { PyObject* GetNextChild(const wxTreeItemId& item, void* cookie) {
wxTreeItemId ritem = self->GetNextChild(item, cookie); wxTreeItemId* ritem = new wxTreeItemId(self->GetNextChild(item, cookie));
wxPyBeginBlockThreads(); wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2); PyObject* tup = PyTuple_New(2);
PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(&ritem, wxT("wxTreeItemId"), True)); PyTuple_SET_ITEM(tup, 0, wxPyConstructObject(ritem, wxT("wxTreeItemId"), True));
PyTuple_SET_ITEM(tup, 1, wxPyConstructObject(cookie, wxT("wxTreeItemIdValue"), True)); PyTuple_SET_ITEM(tup, 1, wxPyMakeSwigPtr(cookie, wxT("void")));
wxPyEndBlockThreads(); wxPyEndBlockThreads();
return tup; return tup;
} }