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

Update unittests to work with wxWidgets 3.1.6

Browse Source
This commit is contained in:
Scott Talbert
2022-04-28 19:53:55 -04:00
parent 5dbd14224a
commit 37ba9563b6
17 changed files with 67 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wx/lib/agw/infobar.py
View File

@@ -381,8 +381,8 @@ class InfoBar(wx.Control):
self._button = wx.BitmapButton(self, wx.ID_ANY, bmp, style=wx.BORDER_NONE)
if wx.Platform != '__WXGTK__':
self._button.SetBitmapPressed(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_PRESSED))
self._button.SetBitmapCurrent(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_CURRENT))
self._button.SetBitmapPressed(wx.BitmapBundle(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_PRESSED)))
self._button.SetBitmapCurrent(wx.BitmapBundle(GetCloseButtonBitmap(self, sizeBmp, colBg, wx.CONTROL_CURRENT)))
self._button.SetBackgroundColour(colBg)
self._button.SetToolTip(_("Hide this notification message."))

3
wx/lib/floatcanvas/NavCanvas.py
View File

@@ -119,7 +119,8 @@ class NavCanvas(wx.Panel):
self.ModesDict = {}
for Mode in Modes:
tool = tb.AddTool(wx.ID_ANY, label=Mode[0],
shortHelp=Mode[0], bitmap=Mode[2],
shortHelp=Mode[0],
bitmap=wx.BitmapBundle(Mode[2]),
kind=wx.ITEM_RADIO)
self.Bind(wx.EVT_TOOL, self.SetMode, tool)
self.ModesDict[tool.GetId()]=Mode[1]

16
wx/lib/inspection.py
View File

@@ -208,15 +208,15 @@ class InspectionFrame(wx.Frame):
tbar = self.CreateToolBar(wx.TB_HORIZONTAL | wx.TB_FLAT | wx.TB_TEXT | wx.NO_BORDER )
tbar.SetToolBitmapSize((24,24))
refreshBmp = Refresh.GetBitmap()
findWidgetBmp = Find.GetBitmap()
showSizersBmp = ShowSizers.GetBitmap()
expandTreeBmp = ExpandTree.GetBitmap()
collapseTreeBmp = CollapseTree.GetBitmap()
highlightItemBmp = HighlightItem.GetBitmap()
evtWatcherBmp = EvtWatcher.GetBitmap()
refreshBmp = wx.BitmapBundle(Refresh.GetBitmap())
findWidgetBmp = wx.BitmapBundle(Find.GetBitmap())
showSizersBmp = wx.BitmapBundle(ShowSizers.GetBitmap())
expandTreeBmp = wx.BitmapBundle(ExpandTree.GetBitmap())
collapseTreeBmp = wx.BitmapBundle(CollapseTree.GetBitmap())
highlightItemBmp = wx.BitmapBundle(HighlightItem.GetBitmap())
evtWatcherBmp = wx.BitmapBundle(EvtWatcher.GetBitmap())
toggleFillingBmp = ShowFilling.GetBitmap()
toggleFillingBmp = wx.BitmapBundle(ShowFilling.GetBitmap())
refreshTool = tbar.AddTool(-1, 'Refresh', refreshBmp,
shortHelp = 'Refresh widget tree (F1)')