aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorMax Horn2007-03-17 00:53:21 +0000
committerMax Horn2007-03-17 00:53:21 +0000
commit15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3 (patch)
tree1658efcaefcad7d9c8301317ea1acd3707048e76 /gui
parenta6f3ed8173a0490855df84e955229c9f77ecf9c2 (diff)
downloadscummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.gz
scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.tar.bz2
scummvm-rg350-15d9bc42ea14d1c1fd5d1f8787664bbf0944d0a3.zip
Force all code to use EventManager::pollEvent instead of OSystem::pollEvent
svn-id: r26156
Diffstat (limited to 'gui')
-rw-r--r--gui/newgui.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp
index cc63d39692..90a5c6d121 100644
--- a/gui/newgui.cpp
+++ b/gui/newgui.cpp
@@ -20,6 +20,7 @@
*/
#include "common/stdafx.h"
+#include "common/events.h"
#include "common/system.h"
#include "common/util.h"
#include "graphics/cursorman.h"
@@ -227,6 +228,8 @@ void NewGui::runLoop() {
if (_useStdCursor)
setupCursor();
}
+
+ Common::EventManager *eventMan = _system->getEventManager();
while (!_dialogStack.empty() && activeDialog == getTopDialog()) {
if (_needRedraw) {
@@ -247,7 +250,7 @@ void NewGui::runLoop() {
OSystem::Event event;
uint32 time = _system->getMillis();
- while (_system->pollEvent(event)) {
+ while (eventMan->pollEvent(event)) {
if (activeDialog != getTopDialog() && event.type != OSystem::EVENT_QUIT && event.type != OSystem::EVENT_SCREEN_CHANGED)
continue;