mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-09 01:28:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4127 from jloehr/FixDialogClosingButtons

Browse source 
Fix dialog closing buttons
This commit is contained in:
shuffle2 2016-10-02 21:16:24 -07:00 • committed by GitHub
commit 5a8abb4f93
8 changed files with 138 additions and 148 deletions
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;
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();
@ -78,7 +78,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);
@ -99,7 +99,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED(event))
SConfig::GetInstance().SaveSettings();
}
void CConfigMain::OnOk(wxCommandEvent& WXUNUSED(event))
void CConfigMain::OnCloseButton(wxCommandEvent& WXUNUSED(event))
{
Close();
}