Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-07 04:20:07 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #438 from RobinD42/fix-issue426

Browse Source 
Give DLG_UNIT some "elegance" ;-)
This commit is contained in:
Robin Dunn
2017-07-22 00:25:12 -07:00
committed by GitHub
parent d3e9b9a9a2 fe75c9acb2
commit 172bd50d41
2 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
etg/window.py
View File

@@ -202,7 +202,11 @@ def run():
A convenience wrapper for :meth:`ConvertDialogToPixels`.
""",
body="""\
return self.ConvertDialogToPixels(dlg_unit)
is_wxType = isinstance(dlg_unit, (wx.Size, wx.Point))
pix = self.ConvertDialogToPixels(dlg_unit)
if not is_wxType:
pix = tuple(pix)
return pix
""")
@@ -359,11 +363,16 @@ def run():
def DLG_UNIT(win, dlg_unit, val2=None):
"""
Convenience function for converting a wx.Point, wx.Size or
(x,y) in dialog units to pixels.
(x,y) in dialog units to pixels, using the given window as a
reference.
"""
if val2 is not None:
dlg_unit = (dlg_unit, val2)
return win.ConvertDialogToPixels(dlg_unit)
is_wxType = isinstance(dlg_unit, (wx.Size, wx.Point))
pix = win.ConvertDialogToPixels(dlg_unit)
if not is_wxType:
pix = tuple(pix)
return pix
DLG_PNT = wx.deprecated(DLG_UNIT, "Use DLG_UNIT instead.")
DLG_SZE = wx.deprecated(DLG_UNIT, "Use DLG_UNIT instead.")

35
unittests/test_window.py
View File

@@ -103,31 +103,36 @@ class WindowTests(wtc.WidgetTestCase):
def test_DLG_UNIT(self):
def _check(val):
def _check(val, typ):
assert isinstance(val, typ)
a, b = val
assert isinstance(a, int)
assert isinstance(b, int)
val = wx.DLG_UNIT(self.frame, wx.Point(10,10))
_check(val)
_check(val, wx.Point)
val = wx.DLG_UNIT(self.frame, wx.Size(10,10))
_check(val)
_check(val, wx.Size)
val = wx.DLG_UNIT(self.frame, (10,10))
_check(val)
_check(val, tuple)
val = wx.DLG_UNIT(self.frame, [10,10])
_check(val, tuple)
val = self.frame.DLG_UNIT(wx.Point(10, 10))
_check(val)
val = self.frame.DLG_UNIT(wx.Size(10, 10))
_check(val)
val = self.frame.DLG_UNIT((10, 10))
_check(val)
_check(val, wx.Point)
val = self.frame.DLG_UNIT(wx.Size(10, 10))
_check(val, wx.Size)
val = self.frame.DLG_UNIT((10, 10))
_check(val, tuple)
val = self.frame.DLG_UNIT([10, 10])
_check(val, tuple)
val = wx.DLG_UNIT(self.frame, wx.Point(10, 10))
assert isinstance(val, wx.Point)
val = wx.DLG_UNIT(self.frame, wx.Size(10, 10))
assert isinstance(val, wx.Size)
wx.DLG_SZE
wx.DLG_PNT