From 9afc16961f249e8fa8873d28baa7890e775abe6f Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Fri, 15 Aug 2014 20:09:35 -0500 Subject: [PATCH] Fix the Not button showing up in the advanced control dialog. The Not button isn't supposed to show up on outputs to controllers. When we generate the button it still shows up if it isn't added to the sizer since the parent window still owns it. Fixes this issue report https://forums.dolphin-emu.org/Thread-linux-ui-bug-in-gc-pad-configuration-menu?pid=335269#pid335269 --- Source/Core/DolphinWX/InputConfigDiag.cpp | 5 ++--- 1 file 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);