From: Robin Dunn Date: Fri, 14 Jul 2006 19:57:20 +0000 (+0000) Subject: Don't let SWIG see the wxTreeCtrl name anywhere so it will use the X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/20eebe1aa8b60bfb5bb6f20fd0e14dfddd85bd03 Don't let SWIG see the wxTreeCtrl name anywhere so it will use the type_info for our wxPyTreeCtrl instead. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/_notebook.i b/wxPython/src/_notebook.i index 39bf218ea0..e654aa9ffa 100644 --- a/wxPython/src/_notebook.i +++ b/wxPython/src/_notebook.i @@ -529,7 +529,7 @@ public: int GetPageParent(size_t pos) const; // the tree control we use for showing the pages index tree - wxTreeCtrl* GetTreeCtrl() const; + wxPyTreeCtrl* GetTreeCtrl() const; }; diff --git a/wxPython/src/html.i b/wxPython/src/html.i index f272833ff8..3212eb0620 100644 --- a/wxPython/src/html.i +++ b/wxPython/src/html.i @@ -1373,6 +1373,9 @@ enum { }; +%{ + typedef wxTreeCtrl wxPyTreeCtrl; +%} MustHaveApp(wxHtmlHelpWindow); @@ -1464,7 +1467,7 @@ public: wxHtmlHelpFrameCfg& GetCfgData(); // Gets the tree control - wxTreeCtrl *GetTreeCtrl() const; + wxPyTreeCtrl *GetTreeCtrl() const; };