diff options
| author | Lioncash <mathew1800@gmail.com> | 2016-10-10 16:41:58 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2016-10-10 16:45:31 -0400 |
| commit | 6420a1c715995f09bedd0cf94ca653508be32da1 (patch) | |
| tree | dbfd7e0f34211c07c633e73db3b799255076d241 /Source/Core/DolphinWX/Frame.cpp | |
| parent | a583d36c7f38fac9fb66c059bf6990bfd819591f (diff) | |
Frame: Separate menu creation into individual functions
Keeps related menu items together based on top level menu. This will be
more convenient in the future when debugger menu bar item handling is
moved to CFrame, as it won't be a huge amount of code in one function.
This also makes it easier to locate menu bar code whenever it needs to be
changed.
Diffstat (limited to 'Source/Core/DolphinWX/Frame.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 5d810f0b11..2253297bb6 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -401,10 +401,10 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo GetStatusBar()->Hide(); // Give it a menu bar - wxMenuBar* menubar_active = CreateMenu(); + wxMenuBar* menubar_active = CreateMenuBar(); SetMenuBar(menubar_active); // Create a menubar to service requests while the real menubar is hidden from the screen - m_menubar_shadow = CreateMenu(); + m_menubar_shadow = CreateMenuBar(); // --------------- // Main panel @@ -1306,7 +1306,7 @@ void CFrame::DoFullscreen(bool enable_fullscreen) // Recreate the menubar if needed. if (wxFrame::GetMenuBar() == nullptr) { - SetMenuBar(CreateMenu()); + SetMenuBar(CreateMenuBar()); } // Show statusbar if enabled |