Added wx.Treebook.GetTreeCtrl and wx.Choicebook.GetChoiceCtrl

This commit is contained in:
Robin Dunn
2018-07-17 20:11:33 -07:00
parent f8a2c7f0cc
commit 8e14cac164
5 changed files with 29 additions and 0 deletions

View File

@@ -36,6 +36,8 @@ Changes in this release include the following:
* Added a Python 3.7 builder on Fedora 28. (#925)
* Added wx.Treebook.GetTreeCtrl and wx.Choicebook.GetChoiceCtrl. (#918)

View File

@@ -38,6 +38,11 @@ def run():
tools.fixWindowClass(c)
tools.fixBookctrlClass(c)
c.addCppMethod('wxChoice*', 'GetChoiceCtrl', '()',
doc="Returns the choice control used for selecting pages.",
body="return(self->GetChoiceCtrl());")
module.addPyCode("""\
EVT_CHOICEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_CHOICEBOOK_PAGE_CHANGED, 1 )
EVT_CHOICEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_CHOICEBOOK_PAGE_CHANGING, 1 )

View File

@@ -38,6 +38,10 @@ def run():
tools.fixWindowClass(c)
tools.fixBookctrlClass(c)
c.addCppMethod('wxTreeCtrl*', 'GetTreeCtrl', '()',
doc="Returns the tree control used for selecting pages.",
body="return(self->GetTreeCtrl());")
module.addPyCode("""\
EVT_TREEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_TREEBOOK_PAGE_CHANGED, 1 )
EVT_TREEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_TREEBOOK_PAGE_CHANGING, 1)

View File

@@ -31,6 +31,14 @@ class choicebk_Tests(wtc.WidgetTestCase):
book.AddPage(wx.Panel(book), 'two')
def test_choicebk4(self):
book = wx.Choicebook(self.frame)
book.AddPage(wx.Panel(book), 'one')
book.AddPage(wx.Panel(book), 'two')
choice = book.GetChoiceCtrl()
assert isinstance(choice, wx.Choice)
#---------------------------------------------------------------------------
if __name__ == '__main__':

View File

@@ -30,6 +30,16 @@ class treebook_Tests(wtc.WidgetTestCase):
book.AddSubPage(wx.Panel(book), 'three')
def test_treebook4(self):
book = wx.Treebook(self.frame)
book.AddPage(wx.Panel(book), 'one')
book.AddPage(wx.Panel(book), 'two')
book.AddSubPage(wx.Panel(book), 'three')
tree = book.GetTreeCtrl()
assert isinstance(tree, wx.TreeCtrl)
#---------------------------------------------------------------------------
if __name__ == '__main__':