From 4d2f058fe8b82dd6edfa9ef6b540d0436ed8e23e Mon Sep 17 00:00:00 2001 From: hthh Date: Fri, 18 Nov 2016 21:20:27 +1100 Subject: [PATCH] DolphinWX: Fix toolbar creation on macOS --- Source/Core/DolphinWX/Frame.cpp | 2 +- Source/Core/DolphinWX/MainToolBar.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 290b1a8e10..7edf138606 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -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)); diff --git a/Source/Core/DolphinWX/MainToolBar.cpp b/Source/Core/DolphinWX/MainToolBar.cpp index b8d33b8c31..fd2f7719b2 100644 --- a/Source/Core/DolphinWX/MainToolBar.cpp +++ b/Source/Core/DolphinWX/MainToolBar.cpp @@ -21,7 +21,6 @@ MainToolBar::MainToolBar(ToolBarType type, wxWindow* parent, wxWindowID id, cons wxToolBar::SetToolBitmapSize(FromDIP(wxSize{32, 32})); InitializeBitmaps(); AddToolBarButtons(); - wxToolBar::Realize(); BindEvents(); }