InputConfigDialog: Don't show "..." for complicated expressions

Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well.
This commit is contained in:
Jasper St. Pierre
2013-06-29 18:27:11 -04:00
parent eb153cfded
commit d5983b587e
4 changed files with 3 additions and 29 deletions

View File

@ -240,10 +240,9 @@ void GamepadPage::UpdateGUI()
, e = (*g)->control_buttons.end();
for (; i!=e; ++i) {
ControllerInterface::ControlReference *r = (*i)->control_reference;
if (r->IsComplicated())
(*i)->SetLabel("...");
else
(*i)->SetLabel(StrToWxStr((*i)->control_reference->expression));
wxString expr = StrToWxStr((*i)->control_reference->expression);
expr.Replace("&", "&&");
(*i)->SetLabel(expr);
}
// cboxes