diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-08-15 20:25:56 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-08-15 20:25:56 -0500 |
| commit | 7a2fe73310ef951e5a1b2cf950ee635922b1a897 (patch) | |
| tree | 2edb3633617f6f39c6a47be53942cee09a82891b /Source/Core | |
| parent | 239e04db02fb507d66e8a4142e6e0572bd24438f (diff) | |
| parent | 9afc16961f249e8fa8873d28baa7890e775abe6f (diff) | |
Merge pull request #816 from Sonicadvance1/fix-not-button
Fix the Not button showing up in the advanced control dialog.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/InputConfigDiag.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index 0f6db87fdc..ef7d29b99c 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -564,9 +564,6 @@ wxStaticBoxSizer* ControlDialog::CreateControlChooser(GamepadPage* const parent) wxButton* const select_button = new wxButton(this, -1, _("Select")); 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")); 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 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")); and_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); + not_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); add_button->Bind(wxEVT_BUTTON, &ControlDialog::AppendControl, this); button_sizer->Add(and_button, 1, 0, 5); |