diff --git a/etg/grid.py b/etg/grid.py index 3cacc9f5..4d33b95a 100644 --- a/etg/grid.py +++ b/etg/grid.py @@ -266,6 +266,8 @@ def run(): c.find('GetAlignment.vAlign').out = True c.find('GetNonDefaultAlignment.hAlign').out = True c.find('GetNonDefaultAlignment.vAlign').out = True + c.find('GetSize.num_rows').out = True + c.find('GetSize.num_cols').out = True c.find('SetEditor.editor').transfer = True c.find('SetRenderer.renderer').transfer = True diff --git a/ext/wxWidgets b/ext/wxWidgets index 0e333f33..dfcffe77 160000 --- a/ext/wxWidgets +++ b/ext/wxWidgets @@ -1 +1 @@ -Subproject commit 0e333f336bc329fa333c2694d0ca1faeec43808a +Subproject commit dfcffe7783e6b1eafb3ed78afbe3a722b27a6bb6 diff --git a/unittests/test_grid.py b/unittests/test_grid.py index 9ad7bc5e..ba15ac7c 100644 --- a/unittests/test_grid.py +++ b/unittests/test_grid.py @@ -100,13 +100,37 @@ class grid_Tests(wtc.WidgetTestCase): def test_grid18(self): a = wx.grid.GridCellAttr() a.DecRef() + + def test_grid18a(self): + # test that some GCA methods which were missing are now present + a = wx.grid.GridCellAttr() + b = wx.grid.GridCellAttr() + a.MergeWith(b) + + a.SetFont(wx.NORMAL_FONT) + a.SetOverflow(True) + a.SetSize(3,4) + a.SetKind(wx.grid.GridCellAttr.Cell) + + a.HasReadWriteMode() + a.HasOverflowMode() + a.HasSize() + + a.GetSize() + a.GetOverflow() + a.GetKind() + a.DecRef() + + def test_grid19(self): wx.grid.GridCellAttr.Any wx.grid.GridCellAttr.Cell wx.grid.GridCellAttr.Row wx.grid.GridCellAttr.Col - + wx.grid.GridCellAttr.Default + wx.grid.GridCellAttr.Merged + def test_grid20(self): class MyRenderer(wx.grid.GridCornerHeaderRenderer):