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

Hopeful Windows buildfix (this better not break OS X)

This commit is contained in:
Jordan Woyak 2013-01-13 16:13:38 -06:00
parent d3f8e8e8f3
commit 3510454a94
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -18,6 +18,7 @@
#include <string> // System #include <string> // System
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
#include <functional>
#include <wx/spinbutt.h> #include <wx/spinbutt.h>
#include "Common.h" #include "Common.h"
@ -596,11 +597,11 @@ void CConfigMain::CreateGUIControls()
theme_selection->SetSelection(theme_selection->GetCount() - 1); theme_selection->SetSelection(theme_selection->GetCount() - 1);
}); });
theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, [this,theme_selection](wxEvent&) theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([this,theme_selection](wxEvent&)
{ {
SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection(); SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
main_frame->InitBitmaps(); main_frame->InitBitmaps();
}); }));
auto const scInterface = new wxBoxSizer(wxHORIZONTAL); auto const scInterface = new wxBoxSizer(wxHORIZONTAL);
scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5); scInterface->Add(TEXT_BOX(DisplayPage, _("Theme:")), 0, wxALIGN_CENTER_VERTICAL | wxALL, 5);