Fix render to main crashing in fullscreen.

When hiding the menubar (for going fullscreen with render to main),
keep a functionally-duplicate menubar around for servicing menubar
actions.
This commit is contained in:
Shawn Hoffman
2014-09-05 22:15:10 -07:00
parent 387e1e3f21
commit 7308b809d8
3 changed files with 38 additions and 18 deletions

View File

@ -129,6 +129,7 @@ public:
void UpdateTitle(const std::string &str);
const CGameListCtrl *GetGameListCtrl() const;
virtual wxMenuBar* GetMenuBar() const override;
#ifdef __WXGTK__
Common::Event panic_event;
@ -199,9 +200,11 @@ private:
wxBitmap m_Bitmaps[EToolbar_Max];
wxBitmap m_BitmapsMenu[EToolbar_Max];
wxMenuBar* m_menubar_shadow;
void PopulateToolbar(wxToolBar* toolBar);
void RecreateToolbar();
void CreateMenu();
wxMenuBar* CreateMenu();
// Utility
wxString GetMenuLabel(int Id);