aboutsummaryrefslogtreecommitdiff
path: root/gui/gui-manager.cpp
diff options
context:
space:
mode:
authorTarek Soliman2012-02-13 23:24:09 -0600
committerTarek Soliman2012-02-13 23:24:59 -0600
commit5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb (patch)
treed408ba0cdddaa2f2e8047f2327f03f2515d3c556 /gui/gui-manager.cpp
parentad9fdfd3904a78da10cbd3f8e0c7358b9d5d4d8b (diff)
downloadscummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.gz
scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.tar.bz2
scummvm-rg350-5cf932198e289b8e8d2fe0ee3e57d7cfbf3b65eb.zip
KEYMAPPER: Fix Action ctor args in most keymaps
Diffstat (limited to 'gui/gui-manager.cpp')
-rw-r--r--gui/gui-manager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9fa41798d5..465af5448f 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -112,10 +112,10 @@ void GuiManager::initKeymap() {
Action *act;
Keymap *guiMap = new Keymap(kGuiKeymapName);
- act = new Action(guiMap, "CLOS", _("Close"), kGenericActionType, kStartKeyType);
+ act = new Action(guiMap, "CLOS", _("Close"), kQuitActionType);
act->addKeyEvent(KeyState(KEYCODE_ESCAPE, ASCII_ESCAPE, 0));
- act = new Action(guiMap, "CLIK", _("Mouse click"));
+ act = new Action(guiMap, "CLIK", _("Mouse click"), kLeftClickActionType);
act->addLeftClickEvent();
act = new Action(guiMap, "VIRT", _("Display keyboard"), kVirtualKeyboardActionType);
@@ -124,7 +124,7 @@ void GuiManager::initKeymap() {
act = new Action(guiMap, "REMP", _("Remap keys"), kKeyRemapActionType);
act->addKeyEvent(KeyState(KEYCODE_F8, ASCII_F8, 0));
- act = new Action(guiMap, "FULS", _("Toggle FullScreen"), kKeyRemapActionType);
+ act = new Action(guiMap, "FULS", _("Toggle FullScreen"));
act->addKeyEvent(KeyState(KEYCODE_RETURN, ASCII_RETURN, KBD_ALT));
mapper->addGlobalKeymap(guiMap);