diff options
| author | Mat M <mathew1800@gmail.com> | 2016-10-13 15:45:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 15:45:20 -0400 |
| commit | 14facbc438fed7ec3c2d1a0e7045ba1b47b5a8c2 (patch) | |
| tree | 2c3218a05ecb220786e6ee676c1c19cabfbe12a8 /Source/Core/DolphinWX/Frame.cpp | |
| parent | 5541237b74e058393ff9eb01beb6823fef161223 (diff) | |
| parent | 6a67b571cca0cb86ac873a117122f47b0f62728e (diff) | |
Merge pull request #4339 from lioncash/wx-menu
DolphinWX: Move debugger menu item creation to CFrame
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 |