diff --git a/etg/_adv.py b/etg/_adv.py index 7ede6c0f..dd4b5e26 100644 --- a/etg/_adv.py +++ b/etg/_adv.py @@ -74,6 +74,7 @@ def run(): module.addHeaderCode('#include ') module.addImport('_core') + module.addImport('_dataview') # because of wx.adv.TreeListCtrl module.addPyCode("import wx", order=10) module.addInclude(INCLUDES) diff --git a/etg/treelist.py b/etg/treelist.py index f2c1cbe5..7096a5e8 100644 --- a/etg/treelist.py +++ b/etg/treelist.py @@ -38,11 +38,6 @@ def run(): module.find('wxTreeListEventHandler').ignore() module.find('wxTreeListItems').ignore() - module.insertItem(0, etgtools.WigCode("""\ - // forward declare - class wxDataViewCtrl; - """)) - #----------------------------------------------------------------- c = module.find('wxTreeListItem') diff --git a/unittests/test_treelist.py b/unittests/test_treelist.py index 836c98c5..68deac26 100644 --- a/unittests/test_treelist.py +++ b/unittests/test_treelist.py @@ -77,6 +77,15 @@ class treelist_Tests(wtc.WidgetTestCase): self.assertTrue(isinstance(s, list)) self.assertEqual(len(s), 2) + + def test_treelist4(self): + tlc = wx.adv.TreeListCtrl(self.frame, style=wx.adv.TL_MULTIPLE) + root = self._populateTree(tlc) + + # test if embedded DataViewCtrl is returned as the correct type + dvc = tlc.GetChildren()[0] + self.assertTrue(hasattr(dvc, 'IsTopLevel')) + self.assertEqual(dvc.__class__.__module__, 'wx._dataview')