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 branch 'master' into release-prep

Browse Source
This commit is contained in:
Robin Dunn
2017-07-17 12:19:32 -07:00
parent 1fb5d77caf 60ba661bbd
commit 7a0361fa4b
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Main.py
View File

@@ -1354,7 +1354,7 @@ class DemoTaskBarIcon(TaskBarIcon):
elif "wxGTK" in wx.PlatformInfo:
img = img.Scale(22, 22)
# wxMac can be any size upto 128x128, so leave the source img alone....
icon = wx.IconFromBitmap(img.ConvertToBitmap())
icon = wx.Icon(img.ConvertToBitmap())
return icon

8
etg/grid.py
View File

@@ -467,10 +467,10 @@ def run():
# But also keep aliases for the old names, just in case
c.addPyCode("""\
Grid.GridSelectCells = Grid.SelectCells
Grid.GridSelectRows = Grid.SelectRows
Grid.GridSelectColumns = Grid.SelectColumns
Grid.GridSelectRowsOrColumns = Grid.SelectRowsOrColumns
Grid.wxGridSelectCells = Grid.SelectCells
Grid.wxGridSelectRows = Grid.SelectRows
Grid.wxGridSelectColumns = Grid.SelectColumns
Grid.wxGridSelectRowsOrColumns = Grid.SelectRowsOrColumns
""")
#-----------------------------------------------------------------

6
unittests/test_window.py
View File

@@ -122,6 +122,12 @@ class WindowTests(wtc.WidgetTestCase):
val = self.frame.DLG_UNIT((10, 10))
_check(val)
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