Use the OOR typemap for wxTreeCtrls too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/msw/controls2.cpp b/wxPython/src/msw/controls2.cpp
index 1a3105755e5ea8a1ea064d3cc05bbbc1362cd68d..c93d7be84238a544f0272b7ec8cf0f4a4f4e2959 100644 (file)
--- a/wxPython/src/msw/controls2.cpp
+++ b/wxPython/src/msw/controls2.cpp
@@ -10508,7 +10508,6 @@ static PyObject *_wrap_wxGenericDirCtrl_GetTreeCtrl(PyObject *self, PyObject *ar
     wxGenericDirCtrl * _arg0;
     PyObject * _argo0 = 0;
     char *_kwnames[] = { "self", NULL };
-    char _ptemp[128];
 
     self = self;
     if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGenericDirCtrl_GetTreeCtrl",_kwnames,&_argo0)) 
@@ -10526,13 +10525,7 @@ static PyObject *_wrap_wxGenericDirCtrl_GetTreeCtrl(PyObject *self, PyObject *ar
 
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) return NULL;
-}    if (_result) {
-        SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeCtrl_p");
-        _resultobj = Py_BuildValue("s",_ptemp);
-    } else {
-        Py_INCREF(Py_None);
-        _resultobj = Py_None;
-    }
+}{ _resultobj = wxPyMake_wxObject(_result); }
     return _resultobj;
 }
 

diff --git a/wxPython/src/msw/controls2.py b/wxPython/src/msw/controls2.py
index 7f39893d1b6e21f0c2b7a02a5b17d8489d48fa29..a972112caae6e8bc6b535a574efced401a789d1a 100644 (file)
--- a/wxPython/src/msw/controls2.py
+++ b/wxPython/src/msw/controls2.py
@@ -1232,7 +1232,6 @@ class wxGenericDirCtrlPtr(wxControlPtr):
         return val
     def GetTreeCtrl(self, *_args, **_kwargs):
         val = apply(controls2c.wxGenericDirCtrl_GetTreeCtrl,(self,) + _args, _kwargs)
-        if val: val = wxTreeCtrlPtr(val) 
         return val
     def GetFilterListCtrl(self, *_args, **_kwargs):
         val = apply(controls2c.wxGenericDirCtrl_GetFilterListCtrl,(self,) + _args, _kwargs)

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index cd202b68fd4a810a2aa7d7f24eaf33f4ed4fa397..d32602247b1747aef39bc6485a286880cd848817 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -396,6 +396,7 @@ $function
 %typemap(python, out) wxTextCtrl*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBar*                { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxToolBarBase*            { $target = wxPyMake_wxObject($source); }
+%typemap(python, out) wxTreeCtrl*               { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxWindow*                 { $target = wxPyMake_wxObject($source); }
 %typemap(python, out) wxHtmlWindow*             { $target = wxPyMake_wxObject($source); }