Remove circular import mainFrame <> mainMenuBar

This commit is contained in:
Ryan Holmes
2017-02-07 09:37:20 -05:00
parent 542542f48d
commit dfc5627031
2 changed files with 6 additions and 5 deletions

View File

@@ -146,6 +146,8 @@ class MainFrame(wx.Frame):
# Load stored settings (width/height/maximized..)
self.LoadMainFrameAttribs()
self.disableOverrideEditor = disableOverrideEditor
# Fix for msw (have the frame background color match panel color
if 'wxMSW' in wx.PlatformInfo:
self.SetBackgroundColour(wx.SystemSettings.GetColour(wx.SYS_COLOUR_BTNFACE))
@@ -205,7 +207,7 @@ class MainFrame(wx.Frame):
self.closePageId = wx.NewId()
self.widgetInspectMenuID = wx.NewId()
self.SetMenuBar(MainMenuBar())
self.SetMenuBar(MainMenuBar(self))
self.registerMenu()
# Internal vars to keep track of other windows (graphing/stats)