From ba7f63cba471651bc83cd9af89ad050ac7c528c8 Mon Sep 17 00:00:00 2001 From: Ben Hagen Date: Sun, 9 Jul 2017 13:14:38 +0200 Subject: [PATCH 1/3] Use wx.Icon instead of wx.IconFromBitmap --- demo/Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/Main.py b/demo/Main.py index fc641a02..79364bfc 100644 --- a/demo/Main.py +++ b/demo/Main.py @@ -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 From b1b91dface47cefe847e4a0e584b116d2f87fe4d Mon Sep 17 00:00:00 2001 From: Mesalu Date: Thu, 13 Jul 2017 11:18:49 -0700 Subject: [PATCH 2/3] Update test_window.py Add checks to ensure correct type is returned per input. --- unittests/test_window.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unittests/test_window.py b/unittests/test_window.py index 747e89cb..de9ccec1 100644 --- a/unittests/test_window.py +++ b/unittests/test_window.py @@ -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 From 60ba661bbdedc1fbd61fd450557c2de27baff05f Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Fri, 7 Jul 2017 11:17:15 -0700 Subject: [PATCH 3/3] The old names for the wxGridSelectionModes enum had leading "wx", put it back --- etg/grid.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etg/grid.py b/etg/grid.py index 94e6c575..36f8eeaf 100644 --- a/etg/grid.py +++ b/etg/grid.py @@ -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 """) #-----------------------------------------------------------------