ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #816 from Sonicadvance1/fix-not-button 

Fix the Not button showing up in the advanced control dialog.
This commit is contained in:
Ryan Houdek 2014-08-15 20:25:56 -05:00
parent 239e04db02 9afc16961f
commit 7a2fe73310
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -564,9 +564,6 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
wxButton* const select_button = new wxButton(this, -1, _("Select")); wxButton* const select_button = new wxButton(this, -1, _("Select"));
select_button->Bind(wxEVT_BUTTON, &ControlDialog::SetSelectedControl, this); select_button->Bind(wxEVT_BUTTON, &ControlDialog::SetSelectedControl, this);
wxButton* const not_button = new wxButton(this, -1, _("! NOT"));
not_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
wxButton* const or_button = new wxButton(this, -1, _("| OR")); wxButton* const or_button = new wxButton(this, -1, _("| OR"));
or_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); or_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
@ -581,9 +578,11 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent)
{ {
// TODO: check if && is good on other OS // TODO: check if && is good on other OS
wxButton* const and_button = new wxButton(this, -1, _("&& AND")); wxButton* const and_button = new wxButton(this, -1, _("&& AND"));
wxButton* const not_button = new wxButton(this, -1, _("! NOT"));
wxButton* const add_button = new wxButton(this, -1, _("+ ADD")); wxButton* const add_button = new wxButton(this, -1, _("+ ADD"));
and_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); and_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
not_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
add_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); add_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this);
button_sizer->Add(and_button, 1, 0, 5); button_sizer->Add(and_button, 1, 0, 5);