Browse Source

Removed Validate Command

Returning a value from a code execution is problematic...
Peter Robinson 4 years ago
parent
commit
3b0f5cfa85

+ 2 - 10
engine/source/gui/guiTextEditCtrl.cc

@@ -67,7 +67,6 @@ GuiTextEditCtrl::GuiTextEditCtrl()
    mHistoryIndex = 0;
    mHistoryBuf = NULL;
 
-   mValidateCommand = StringTable->EmptyString;
    mEscapeCommand = StringTable->EmptyString;
    mPasswordMask = StringTable->insert( "*" );
 
@@ -110,7 +109,6 @@ void GuiTextEditCtrl::initPersistFields()
    addDepricatedField("tabComplete");
 
    addGroup("Text Edit");
-   addField("validateCommand",   TypeString,    Offset(mValidateCommand,   GuiTextEditCtrl));
    addField("escapeCommand",     TypeString,    Offset(mEscapeCommand,     GuiTextEditCtrl));
    addField("sinkAllKeyEvents",  TypeBool,      Offset(mSinkAllKeyEvents,  GuiTextEditCtrl));
    addField("password", TypeBool, Offset(mPasswordText, GuiTextEditCtrl));
@@ -335,13 +333,9 @@ void GuiTextEditCtrl::selectAllText()
 bool GuiTextEditCtrl::validate()
 {
 	bool valid = true;
-	if ( mValidateCommand[0] )
+	if (isMethod("onValidate"))
 	{
-		valid = Con::evaluate( mValidateCommand, false );
-	}
-	else if (isMethod("onValidate"))
-	{
-		valid = Con::executef(this, 2, "onValidate");
+		valid = dAtob(Con::executef(this, 2, "onValidate"));
 	}
 	return valid;
 }
@@ -635,8 +629,6 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
         switch (event.keyCode)
         {
             case KEY_TAB:
-				if (isMethod("onTab"))
-					Con::executef(this, 2, "onTab", "1");
                return tabPrev();
 
             case KEY_HOME:

+ 0 - 4
engine/source/gui/guiTextEditCtrl.h

@@ -42,7 +42,6 @@ protected:
 	S32 mMaxStrLen; 
    StringBuffer mTextBuffer;
 
-   StringTableEntry mValidateCommand;
    StringTableEntry mEscapeCommand;
 
 public:
@@ -156,9 +155,6 @@ public:
 	void keyDenied();
 	void execConsoleCallback();
 
-	inline void setValidateCommand(const char *newCmd) { mValidateCommand = newCmd ? StringTable->insert(newCmd) : StringTable->EmptyString; }
-	inline const char * getValidateCommand() { return mValidateCommand; }
-
 	inline void setEscapeCommand(const char *newCmd) { mEscapeCommand = newCmd ? StringTable->insert(newCmd) : StringTable->EmptyString; }
 	inline const char * getEscapeCommand() { return mEscapeCommand; }
 

+ 4 - 4
engine/source/gui/guiTextEditCtrl_ScriptBinding.h

@@ -65,18 +65,18 @@ ConsoleMethodWithDocs(GuiTextEditCtrl, selectAllText, ConsoleVoid, 2, 2, "()")
 /*! Calls the validation function for the control. This is depreciated. Please use validate() instead.
 	@return No return value.
 */
-ConsoleMethodWithDocs(GuiTextEditCtrl, forceValidateText, ConsoleVoid, 2, 2, "()")
+ConsoleMethodWithDocs(GuiTextEditCtrl, forceValidateText, ConsoleBool, 2, 2, "()")
 {
 	Con::warnf("GuiTextEditCtrl::forceValidateText() is depreciated. Please use GuiTextEditCtrl::validate() instead.");
-	object->validate();
+	return object->validate();
 }
 
 /*! Calls the validation function for the control.
 	@return No return value.
 */
-ConsoleMethodWithDocs(GuiTextEditCtrl, validate, ConsoleVoid, 2, 2, "()")
+ConsoleMethodWithDocs(GuiTextEditCtrl, validate, ConsoleBool, 2, 2, "()")
 {
-	object->validate();
+	return object->validate();
 }
 
 /*! Sets the returnCausesTab flag. If true, the pressing enter will attempt to tab to the next control. False will keep the focus in this control.