From 679573f18c1f2dff2245649b60ac0d1fb41b8755 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 14 Jul 2012 21:37:17 +0000 Subject: [PATCH] Handle & test the Calc[Un]ScrolledPosition overloads taking a wxPoint. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72089 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/scrolwin.py | 10 ++++++---- unittests/test_scrolwin.py | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/etg/scrolwin.py b/etg/scrolwin.py index 019bcd48..4084d613 100644 --- a/etg/scrolwin.py +++ b/etg/scrolwin.py @@ -39,11 +39,13 @@ def run(): scrolled.find('GetViewStart.x').out = True scrolled.find('GetViewStart.y').out = True - scrolled.find('CalcScrolledPosition.xx').out = True - scrolled.find('CalcScrolledPosition.yy').out = True + m = scrolled.find('CalcScrolledPosition').findOverload('xx') + m.find('xx').out = True + m.find('yy').out = True - scrolled.find('CalcUnscrolledPosition.xx').out = True - scrolled.find('CalcUnscrolledPosition.yy').out = True + m = scrolled.find('CalcUnscrolledPosition').findOverload('xx') + m.find('xx').out = True + m.find('yy').out = True scrolled.find('GetScrollPixelsPerUnit.xUnit').out = True scrolled.find('GetScrollPixelsPerUnit.yUnit').out = True diff --git a/unittests/test_scrolwin.py b/unittests/test_scrolwin.py index e6f0c223..117f89e7 100644 --- a/unittests/test_scrolwin.py +++ b/unittests/test_scrolwin.py @@ -22,6 +22,9 @@ class scrolwin_Tests(wtc.WidgetTestCase): self.assertEqual(w.GetViewStart(), (3,3)) # scroll units self.assertEqual(w.CalcScrolledPosition(0,0), (-3*rate,-3*rate)) # pixels self.assertEqual(w.CalcUnscrolledPosition(0,0),(3*rate,3*rate)) # pixels + # also test the Point overloads + self.assertEqual(w.CalcScrolledPosition( (0,0) ), (-3*rate,-3*rate)) # pixels + self.assertEqual(w.CalcUnscrolledPosition( (0,0) ),(3*rate,3*rate)) # pixels def test_scrolwinCtor(self):