Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 01:30:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give dataview.TreeListItem hash and equality operators.

Browse Source 
Remove non equality operators from DataViewItem, as there is no implicit ordering of the items that makes sense
This commit is contained in:
Robin Dunn
2017-04-14 21:28:54 -07:00
parent a79cd3254c
commit 05626ef850
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etg/dataview.py
View File

@@ -84,12 +84,8 @@ def run():
c.addCppMethod('long', '__hash__', '()', """\
return (long)self->GetID();
""")
c.addCppMethod('bool', '__lt__', '(wxDataViewItem* other)', "return (self->GetID() < other->GetID());")
c.addCppMethod('bool', '__le__', '(wxDataViewItem* other)', "return (self->GetID() <= other->GetID());")
c.addCppMethod('bool', '__eq__', '(wxDataViewItem* other)', "return (self->GetID() == other->GetID());")
c.addCppMethod('bool', '__ne__', '(wxDataViewItem* other)', "return (self->GetID() != other->GetID());")
c.addCppMethod('bool', '__ge__', '(wxDataViewItem* other)', "return (self->GetID() >= other->GetID());")
c.addCppMethod('bool', '__gt__', '(wxDataViewItem* other)', "return (self->GetID() > other->GetID());")
c.addAutoProperties()

8
etg/treelist.py
View File

@@ -42,10 +42,18 @@ def run():
#-----------------------------------------------------------------
c = module.find('wxTreeListItem')
assert isinstance(c, etgtools.ClassDef)
c.addCppMethod('int', '__nonzero__', '()', """\
return self->IsOk();
""")
c.addCppMethod('long', '__hash__', '()', """\
return (long)self->GetID();
""")
c.addCppMethod('bool', '__eq__', '(wxTreeListItem* other)', "return (self->GetID() == other->GetID());")
c.addCppMethod('bool', '__ne__', '(wxTreeListItem* other)', "return (self->GetID() != other->GetID());")
#-----------------------------------------------------------------
c = module.find('wxTreeListItemComparator')

12
unittests/test_treelist.py
View File

@@ -65,6 +65,18 @@ class treelist_Tests(wtc.WidgetTestCase):
self.assertTrue(isinstance(s, list))
self.assertEqual(len(s), 1)
self.assertTrue(isinstance(s[0], wx.dataview.TreeListItem))
self.assertTrue(root == s[0])
def test_treelistitem_hashable(self):
tlc = wx.dataview.TreeListCtrl(self.frame)
root = self._populateTree(tlc)
d = dict()
d[root] = 'root'
tlc.Select(root)
s = tlc.GetSelections()
assert d[s[0]] == 'root'
def test_treelist3(self):