From 3f6d549b0e891be33ef48926629d6e626009fc8f Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 18 Feb 2012 22:17:48 -0600
Subject: KEYMAPPER: Move F7 and F8 handling to DefaultEventMapper

---
 base/main.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'base/main.cpp')

diff --git a/base/main.cpp b/base/main.cpp
index 81f9b91aa7..9e4a500da6 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -286,11 +286,13 @@ static void setupKeymapper(OSystem &system) {
 	act = new Action(primaryGlobalKeymap, "SKLI", _("Skip line"));
 	act->addKeyEvent(KeyState(KEYCODE_PERIOD, '.', 0));
 
+#ifdef ENABLE_VKEYBD
 	act = new Action(primaryGlobalKeymap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType);
-	act->addKeyEvent(KeyState(KEYCODE_F7, ASCII_F7, 0));
+	act->addEvent(EVENT_VIRTUAL_KEYBOARD);
+#endif
 
 	act = new Action(primaryGlobalKeymap, "REMP", _("Remap keys"), kKeyRemapActionType);
-	act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
+	act->addEvent(EVENT_KEYMAPPER_REMAP);
 
 	act = new Action(primaryGlobalKeymap, "FULS", _("Toggle FullScreen"));
 	act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT));
-- 
cgit v1.2.3