Merge branch 'wxPy-4.0.x' into fix-issue932-b

CHANGES.rst

@@ -38,6 +38,8 @@ Changes in this release include the following:
 
 * Fix the object ownership transfer for wx.Menu.Insert() (#931)
 
+* Added wx.Treebook.GetTreeCtrl and wx.Choicebook.GetChoiceCtrl. (#918)
+
 * Reverted the changes which removed the content of the wx.lib.pubsub package
   and encouraged users to switch to the real PyPubSub package instead. Removing
   it caused more issues than were expected so it has been restored and the code
@@ -48,7 +50,6 @@ Changes in this release include the following:
 
 
 
-
 4.0.3 "The show must go on. (Die show-stoppers! Die!)"
 ------------------------------------------------------
 * 25-June-2018

etg/choicebk.py

@@ -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 )

etg/treebook.py

@@ -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)

unittests/test_choicebk.py

@@ -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__':

unittests/test_treebook.py

@@ -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__':