From 55cabcea491e18ebf99a8c91f0a72be5fa1a6c3d Mon Sep 17 00:00:00 2001
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Sun, 23 Oct 2011 12:00:46 +0200
Subject: [PATCH] InputDialog: do not return anything from
 drawVirtualKeyboard().

The returned value (action) was ignored, so don't bother returning it.
---
 src/inputdialog.cpp | 14 ++------------
 src/inputdialog.h   |  2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/inputdialog.cpp b/src/inputdialog.cpp
index f11d786..e405804 100644
--- a/src/inputdialog.cpp
+++ b/src/inputdialog.cpp
@@ -135,7 +135,6 @@ bool InputDialog::exec() {
 	Uint32 caretTick = 0, curTick;
 	bool caretOn = true;
 
-	uint action;
 	close = false;
 	ok = true;
 	while (!close) {
@@ -168,7 +167,7 @@ bool InputDialog::exec() {
 		}
 
 		if (ts.initialized()) ts.poll();
-		action = drawVirtualKeyboard();
+		drawVirtualKeyboard();
 		gmenu2x->s->flip();
 
 		switch (inputMgr.waitForPressedButton()) {
@@ -244,9 +243,7 @@ void InputDialog::changeKeys() {
 	}
 }
 
-int InputDialog::drawVirtualKeyboard() {
-	int action = ID_NO_ACTION;
-
+void InputDialog::drawVirtualKeyboard() {
 	//keyboard border
 	gmenu2x->s->rectangle(kbRect, gmenu2x->skinConfColors[COLOR_SELECTION_BG]);
 
@@ -323,11 +320,4 @@ int InputDialog::drawVirtualKeyboard() {
 			(int)(160 + kbLength * KEY_WIDTH / 4),
 			KB_TOP + kb->size() * KEY_HEIGHT + KEY_HEIGHT / 2,
 			ASFont::HAlignCenter, ASFont::VAlignMiddle);
-
-	//if ts released
-	if (ts.initialized() && ts.released() && ts.inRect(kbRect)) {
-		action = ID_ACTION_SELECT;
-	}
-
-	return action;
 }
diff --git a/src/inputdialog.h b/src/inputdialog.h
index 6ce9323..8bb7899 100644
--- a/src/inputdialog.h
+++ b/src/inputdialog.h
@@ -70,7 +70,7 @@ private:
 	void confirm();
 	void changeKeys();
 
-	int drawVirtualKeyboard();
+	void drawVirtualKeyboard();
 	void setKeyboard(int);
 
 public: