mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-05 03:20:08 +01:00
Merge pull request #2373 from arjones6/master
flatmenu memory usage improvements
This commit is contained in:
@@ -4859,10 +4859,11 @@ class FlatMenuItem(object):
|
||||
self.SetLabel(self._text)
|
||||
self.SetMenuBar()
|
||||
|
||||
self._checkMarkBmp = wx.Bitmap(check_mark_xpm)
|
||||
self._checkMarkBmp.SetMask(wx.Mask(self._checkMarkBmp, wx.WHITE))
|
||||
self._radioMarkBmp = wx.Bitmap(radio_item_xpm)
|
||||
self._radioMarkBmp.SetMask(wx.Mask(self._radioMarkBmp, wx.WHITE))
|
||||
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))
|
||||
|
||||
|
||||
def SetLongHelp(self, help):
|
||||
@@ -5355,6 +5356,11 @@ 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)
|
||||
|
||||
|
||||
def SetMenuBar(self, mb):
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user