From 34518951897d5b90d4d345f7f7465b4f86a67ed8 Mon Sep 17 00:00:00 2001
From: Stephen Kennedy
Date: Mon, 18 Aug 2008 19:54:46 +0000
Subject: Final changes to keymapper: * HardwareKey's now have a type too, so
 that we can either match a key to an action or vice versa. * Better test
 keymaps - with special gui keymap that is activated when a dialog is opened

svn-id: r34005
---
 gui/newgui.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gui/newgui.cpp')

diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index 618c7bc873..6c42d8e9b2 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -22,6 +22,7 @@
  * $Id$
  */
 
+#include "backends/keymapper/keymapper.h"
 #include "common/events.h"
 #include "common/system.h"
 #include "common/util.h"
@@ -235,7 +236,7 @@ void NewGui::runLoop() {
 	}
 
 	Common::EventManager *eventMan = _system->getEventManager();
-
+	eventMan->getKeymapper()->pushKeymap("gui");
 	while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
 		if (_needRedraw) {
 			redraw();
@@ -326,6 +327,7 @@ void NewGui::runLoop() {
 		// Delay for a moment
 		_system->delayMillis(10);
 	}
+	eventMan->getKeymapper()->popKeymap();
 
 	// HACK: since we reopen all dialogs anyway on redraw
 	// we for now use Theme::closeAllDialogs here, until
-- 
cgit v1.2.3