Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-20 01:15:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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
parent 3ec6c9cbc0 34385760c6
commit 5a8abb4f93
8 changed files with 138 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/DolphinWX/InputConfigDiag.cpp
View File

@@ -202,10 +202,15 @@ void InputConfigDialog::UpdateControlReferences()
}
}
void InputConfigDialog::ClickSave(wxCommandEvent& event)
void InputConfigDialog::OnClose(wxCloseEvent& event)
{
m_config.SaveConfig();
event.Skip();
EndModal(wxID_OK);
}
void InputConfigDialog::OnCloseButton(wxCommandEvent& event)
{
Close();
}
int ControlDialog::GetRangeSliderValue() const
@@ -1099,11 +1104,12 @@ InputConfigDialog::InputConfigDialog(wxWindow* const parent, InputConfig& config
UpdateDeviceComboBox();
UpdateProfileComboBox();
Bind(wxEVT_BUTTON, &InputConfigDialog::ClickSave, this, wxID_OK);
Bind(wxEVT_CLOSE_WINDOW, &InputConfigDialog::OnClose, this);
Bind(wxEVT_BUTTON, &InputConfigDialog::OnCloseButton, this, wxID_CLOSE);
wxBoxSizer* const szr = new wxBoxSizer(wxVERTICAL);
szr->Add(m_pad_notebook, 0, wxEXPAND | wxTOP | wxLEFT | wxRIGHT, 5);
szr->Add(CreateButtonSizer(wxOK | wxCANCEL | wxNO_DEFAULT), 0, wxEXPAND | wxALL, 5);
szr->Add(CreateButtonSizer(wxCLOSE), 0, wxEXPAND | wxALL, 5);
SetLayoutAdaptationMode(wxDIALOG_ADAPTATION_MODE_ENABLED);
SetSizerAndFit(szr);