(svn r24733) -Codechange: Move handling of editbox keys to window class.

1 files changed, 4 insertions, 13 deletions

diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index 2e875d5f8..73d8af2b8 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -306,12 +306,10 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
 	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
 		EventState state = ES_NOT_HANDLED;
-		if (this->HandleEditBoxKey(WID_SIL_FILTER_TEXT, key, keycode, state) == HEBR_NOT_FOCUSED) {
-			if (CheckHotkeyMatch(signlist_hotkeys, keycode, this) == SLHK_FOCUS_FILTER_BOX) {
-				this->SetFocusedWidget(WID_SIL_FILTER_TEXT);
-				SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
-				state = ES_HANDLED;
-			}
+		if (CheckHotkeyMatch(signlist_hotkeys, keycode, this) == SLHK_FOCUS_FILTER_BOX) {
+			this->SetFocusedWidget(WID_SIL_FILTER_TEXT);
+			SetFocusedWindow(this); // The user has asked to give focus to the text box, so make sure this window is focused.
+			state = ES_HANDLED;
 		}
 
 		return state;
@@ -540,13 +538,6 @@ struct SignWindow : QueryStringBaseWindow, SignList {
 				break;
 		}
 	}
-
-	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
-	{
-		EventState state = ES_NOT_HANDLED;
-		this->HandleEditBoxKey(WID_QES_TEXT, key, keycode, state);
-		return state;
-	}
 };
 
 static const NWidgetPart _nested_query_sign_edit_widgets[] = {