From c00339449a3e467caf937b4b5f2b74db55036c9b Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Sun, 13 Jan 2013 16:27:02 -0600
Subject: [PATCH] buildfix

---
 Source/Core/DolphinWX/Src/ConfigMain.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 0841c72696..968cee42ab 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -18,7 +18,6 @@
 #include <string> // System
 #include <vector>
 #include <algorithm>
-#include <functional>
 #include <wx/spinbutt.h>
 
 #include "Common.h"
@@ -43,6 +42,14 @@
 #include "Main.h"
 #include "VideoBackendBase.h"
 
+#if defined(__APPLE__)
+#include <tr1/functional>
+using std::tr1::function;
+#else
+#include <functional>
+using std::function;
+#endif
+
 #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)
 
 extern CFrame* main_frame;
@@ -597,7 +604,8 @@ void CConfigMain::CreateGUIControls()
 			theme_selection->SetSelection(theme_selection->GetCount() - 1);
 	});
 
-	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, std::function<void(wxEvent&)>([this,theme_selection](wxEvent&)
+	// std::function = avoid error on msvc
+	theme_selection->Bind(wxEVT_COMMAND_CHOICE_SELECTED, function<void(wxEvent&)>([this,theme_selection](wxEvent&)
 	{
 		SConfig::GetInstance().m_LocalCoreStartupParameter.theme_name = theme_selection->GetStringSelection();
 		main_frame->InitBitmaps();