From 984ef8309990c8f41677e92232da7bbd2f6df077 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 5 Apr 2013 04:04:38 +0000 Subject: [PATCH] Add a new wxDataViewItem ctor accepting an integer value. Apparently sip used to auto-convert from int to void* but it doesn't anymore. Fixes #15135 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73781 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/dataview.py | 6 ++++++ unittests/test_dataview.py | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/etg/dataview.py b/etg/dataview.py index c86f22b7..f6bbf468 100644 --- a/etg/dataview.py +++ b/etg/dataview.py @@ -75,6 +75,11 @@ def run(): #----------------------------------------------------------------- c = module.find('wxDataViewItem') assert isinstance(c, etgtools.ClassDef) + + c.addCppCtor('(wxIntPtr id)', """\ + return new wxDataViewItem((void*)id); + """) + c.addCppMethod('int', '__nonzero__', '()', """\ return self->IsOk(); """) @@ -88,6 +93,7 @@ def run(): """) c.addAutoProperties() + module.addItem( tools.wxArrayWrapperTemplate('wxDataViewItemArray', 'wxDataViewItem', module)) module.addPyCode("NullDataViewItem = DataViewItem()") diff --git a/unittests/test_dataview.py b/unittests/test_dataview.py index 3056271e..60e273e6 100644 --- a/unittests/test_dataview.py +++ b/unittests/test_dataview.py @@ -35,6 +35,13 @@ class dataview_Tests(wtc.WidgetTestCase): self.assertFalse(dv.NullDataViewItem) + def test_dataviewItem6(self): + dvi1 = dv.DataViewItem(111) + dvi2 = dv.DataViewItem(222) + self.assertTrue(int(dvi1.GetID()) == 111) + self.assertTrue(int(dvi2.ID) == 222) + + #------------------------------------------------------- def test_dataviewItemAttr1(self): a = dv.DataViewItemAttr()