mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-27 21:40:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change Main Dialog Ok Button to Close

Browse Source
This commit is contained in:
Julian Löhr 2016-08-15 21:18:58 +02:00
parent 4c9c456846
commit 5608815cc8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/Config/ConfigMain.cpp
View File

@ -34,7 +34,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
m_refresh_game_list_on_close = false; m_refresh_game_list_on_close = false;
Bind(wxEVT_CLOSE_WINDOW, &CConfigMain::OnClose, this); 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); Bind(wxDOLPHIN_CFG_REFRESH_LIST, &CConfigMain::OnSetRefreshGameListOnClose, this);
CreateGUIControls(); CreateGUIControls();
@ -80,7 +80,7 @@ void CConfigMain::CreateGUIControls()
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(Notebook, 1, wxEXPAND | wxALL, 5); 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__ #ifdef __APPLE__
main_sizer->SetMinSize(550, 0); main_sizer->SetMinSize(550, 0);
@ -101,7 +101,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event))
SConfig::GetInstance().SaveSettings(); SConfig::GetInstance().SaveSettings();
} }
void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event)) void CConfigMain::OnCloseButton(wxCommandEvent& WXUNUSED(event))
{ {
Close(); Close();
} }

2
Source/Core/DolphinWX/Config/ConfigMain.h
View File

@ -38,7 +38,7 @@ public:
private: private:
void CreateGUIControls(); void CreateGUIControls();
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);
void OnOk(wxCommandEvent& event); void OnCloseButton(wxCommandEvent& event);
void OnSetRefreshGameListOnClose(wxCommandEvent& event); void OnSetRefreshGameListOnClose(wxCommandEvent& event);
wxNotebook* Notebook; wxNotebook* Notebook;