From 5608815cc86c6d400a5afa107cce33c7e9c616f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20L=C3=B6hr?= <julian.loehr@outlook.com>
Date: Mon, 15 Aug 2016 21:18:58 +0200
Subject: [PATCH] Change Main Dialog Ok Button to Close

---
 Source/Core/DolphinWX/Config/ConfigMain.cpp | 6 +++---
 Source/Core/DolphinWX/Config/ConfigMain.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Core/DolphinWX/Config/ConfigMain.cpp b/Source/Core/DolphinWX/Config/ConfigMain.cpp
index 72d6f421ed..c016ff6b98 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Config/ConfigMain.cpp
@@ -34,7 +34,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
   m_refresh_game_list_on_close = false;
 
   Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this);
-  Bind(wxEVT_BUTTON, &CConfigMain::OnOk, this, wxID_OK);
+  Bind(wxEVT_BUTTON, &CConfigMain::OnCloseButton, this, wxID_CLOSE);
   Bind(wxDOLPHIN_CFG_REFRESH_LIST, &CConfigMain::OnSetRefreshGameListOnClose, this);
 
   CreateGUIControls();
@@ -80,7 +80,7 @@ void CConfigMain::CreateGUIControls()
 
   wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
   main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5);
-  main_sizer->Add(CreateButtonSizer(wxOK), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
+  main_sizer->Add(CreateButtonSizer(wxCLOSE), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
 
 #ifdef __APPLE__
   main_sizer->SetMinSize(550, 0);
@@ -101,7 +101,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event))
   SConfig::GetInstance().SaveSettings();
 }
 
-void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event))
+void CConfigMain::OnCloseButton(wxCommandEvent& WXUNUSED(event))
 {
   Close();
 }
diff --git a/Source/Core/DolphinWX/Config/ConfigMain.h b/Source/Core/DolphinWX/Config/ConfigMain.h
index d7334682e7..3e4d965525 100644
--- a/Source/Core/DolphinWX/Config/ConfigMain.h
+++ b/Source/Core/DolphinWX/Config/ConfigMain.h
@@ -38,7 +38,7 @@ public:
 private:
   void CreateGUIControls();
   void OnClose(wxCloseEvent& event);
-  void OnOk(wxCommandEvent& event);
+  void OnCloseButton(wxCommandEvent& event);
   void OnSetRefreshGameListOnClose(wxCommandEvent& event);
 
   wxNotebook* Notebook;