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.

1 files changed, 0 insertions, 17 deletions

diff --git a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
index c68df48e25..5b6495b781 100644
--- a/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
+++ b/Source/Core/InputCommon/Src/ControllerInterface/ExpressionParser.cpp
@@ -210,7 +210,6 @@ public:
 	virtual ControlState GetValue() { return 0; }
 	virtual void SetValue(ControlState state) {}
 	virtual int CountNumControls() { return 0; }
-	virtual bool IsComplicated() { return false; }
 	virtual operator std::string() { return ""; }
 };
 
@@ -237,11 +236,6 @@ public:
 		return 1;
 	}
 
-	virtual bool IsComplicated()
-	{
-		return false;
-	}
-
 	virtual operator std::string()
 	{
 		return "`" + (std::string)qualifier + "`";
@@ -293,11 +287,6 @@ public:
 		return lhs->CountNumControls() + rhs->CountNumControls();
 	}
 
-	virtual bool IsComplicated()
-	{
-		return true;
-	}
-
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*lhs) + ", " + (std::string)(*rhs) + ")";
@@ -345,11 +334,6 @@ public:
 		return inner->CountNumControls();
 	}
 
-	virtual bool IsComplicated()
-	{
-		return true;
-	}
-
 	virtual operator std::string()
 	{
 		return OpName(op) + "(" + (std::string)(*inner) + ")";
@@ -539,7 +523,6 @@ Expression::Expression(ExpressionNode *node_)
 {
 	node = node_;
 	num_controls = node->CountNumControls();
-	is_complicated = node->IsComplicated();
 }
 
 Expression::~Expression()