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 39bf218ea095c0842a06bb747be897ea77e0b246..e654aa9ffa922d960be3b14805e823c1e691fa7d 100644 (file)
--- 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 f272833ff8fa752a877653a0dc1311b6cfa55b3d..3212eb0620fd2d73904039c03f98f9bc34f15dcc 100644 (file)
--- 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;
 
 };