Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2025-12-16 09:40:07 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixup flatmenu memory fix

Browse Source
This commit is contained in:
Scott Talbert
2024-07-11 20:20:49 -04:00
parent cf806af384
commit 3901d05d40
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wx/lib/agw/flatmenu.py
View File

@@ -4860,10 +4860,10 @@ class FlatMenuItem(object):
self.SetMenuBar()
if not hasattr(FlatMenuItem, '_checkMarkBmp'):
FlatMenuItem._checkMarkBmp = wx.Bitmap(check_mark_xpm)
FlatMenuItem._checkMarkBmp.SetMask(wx.Mask(self._checkMarkBmp, wx.WHITE))
FlatMenuItem._radioMarkBmp = wx.Bitmap(radio_item_xpm)
FlatMenuItem._radioMarkBmp.SetMask(wx.Mask(self._radioMarkBmp, wx.WHITE))
FlatMenuItem._checkMarkBmp = wx.Bitmap(check_mark_xpm)
FlatMenuItem._checkMarkBmp.SetMask(wx.Mask(self._checkMarkBmp, wx.WHITE))
FlatMenuItem._radioMarkBmp = wx.Bitmap(radio_item_xpm)
FlatMenuItem._radioMarkBmp.SetMask(wx.Mask(self._radioMarkBmp, wx.WHITE))
def SetLongHelp(self, help):
@@ -5356,10 +5356,12 @@ class FlatMenu(FlatMenuBase):
self.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus)
self.Bind(wx.EVT_TIMER, self.OnTimer)
def Destroy(self, *args, **kwargs):
self.Clear()
super().Destroy(*args, **kwargs)
try:
self.Clear()
finally:
return super().Destroy(*args, **kwargs)
def SetMenuBar(self, mb):