ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4454 from hthh/osx-toolbar-fix 

DolphinWX: Fix toolbar creation on macOS
This commit is contained in:
Mat M 2016-11-18 11:25:56 -05:00 committed by GitHub
parent 6c16f1be8a 4d2f058fe8
commit d3710d5cff
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Frame.cpp
View File

@ -324,7 +324,7 @@ CFrame::CFrame(wxFrame* parent, wxWindowID id, const wxString& title, wxRect geo
g_pCodeWindow->Load();
}
wxFrame::CreateToolBar(wxTB_DEFAULT_STYLE | wxTB_TEXT | wxTB_FLAT);
wxFrame::CreateToolBar(wxTB_DEFAULT_STYLE | wxTB_TEXT | wxTB_FLAT)->Realize();
// Give it a status bar
SetStatusBar(CreateStatusBar(2, wxST_SIZEGRIP, ID_STATUSBAR));

1
Source/Core/DolphinWX/MainToolBar.cpp
View File

@ -21,7 +21,6 @@ MainToolBar::MainToolBar(ToolBarType type, wxWindow* parent, wxWindowID id, cons
wxToolBar::SetToolBitmapSize(FromDIP(wxSize{32, 32}));
InitializeBitmaps();
AddToolBarButtons();
wxToolBar::Realize();
BindEvents();
}