From 98ad3b69af4e198379177dbfd2d41f49e3ba3b1d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 23 Aug 2017 08:54:24 -0500 Subject: [PATCH] Ignore the GetVirtualSize in wxScrolled, and inherit it from wx.Window instead. --- etg/scrolwin.py | 4 ++-- unittests/test_scrolwin.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etg/scrolwin.py b/etg/scrolwin.py index 0890e442..97ed1e54 100644 --- a/etg/scrolwin.py +++ b/etg/scrolwin.py @@ -51,8 +51,8 @@ def run(): scrolled.find('GetScrollPixelsPerUnit.xUnit').out = True scrolled.find('GetScrollPixelsPerUnit.yUnit').out = True - scrolled.find('GetVirtualSize.x').out = True - scrolled.find('GetVirtualSize.y').out = True + # Just ignore this one and let the already tweaked versions be inherited from wx.Window. + scrolled.find('GetVirtualSize').ignore() scrolled.addPrivateCopyCtor() scrolled.addPrivateAssignOp() diff --git a/unittests/test_scrolwin.py b/unittests/test_scrolwin.py index c54534f0..3b17f235 100644 --- a/unittests/test_scrolwin.py +++ b/unittests/test_scrolwin.py @@ -26,6 +26,9 @@ class scrolwin_Tests(wtc.WidgetTestCase): self.assertEqual(w.CalcScrolledPosition( (0,0) ), (-3*rate,-3*rate)) # pixels self.assertEqual(w.CalcUnscrolledPosition( (0,0) ),(3*rate,3*rate)) # pixels + vs = w.GetVirtualSize() + assert isinstance(vs, wx.Size) + def test_scrolwinCtor(self): w = wx.ScrolledWindow(self.frame)