diff options
| author | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-09-19 08:40:12 +0000 |
| commit | 258901bab96f0050385a9912c8ea0fe2a41b2d6f (patch) | |
| tree | a3ae8675b679c9f3b58ac8d97c79369502ea23c1 /gui/newgui.cpp | |
| parent | a89694c0d61a75a960f5bec6c498659c988401cc (diff) | |
| download | scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.gz scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.tar.bz2 scummvm-rg350-258901bab96f0050385a9912c8ea0fe2a41b2d6f.zip | |
Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
Diffstat (limited to 'gui/newgui.cpp')
| -rw-r--r-- | gui/newgui.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gui/newgui.cpp b/gui/newgui.cpp index 51d67b8769..4c9cb5960d 100644 --- a/gui/newgui.cpp +++ b/gui/newgui.cpp @@ -22,7 +22,6 @@ * $Id$ */ -#include "common/stdafx.h" #include "common/events.h" #include "common/system.h" #include "common/util.h" @@ -64,7 +63,7 @@ void GuiObject::reflowLayout() { error("Undefined variable %s.y", _name.c_str()); _w = g_gui.evaluator()->getVar(_name + ".w"); _h = g_gui.evaluator()->getVar(_name + ".h"); - + if (_x < 0) error("Widget <%s> has x < 0", _name.c_str()); if (_x >= g_system->getOverlayWidth()) @@ -109,7 +108,7 @@ NewGui::NewGui() : _needRedraw(false), warning("falling back to classic style"); } #endif - + if (loadClassicTheme) { _theme = new ThemeClassic(_system); assert(_theme); @@ -142,7 +141,7 @@ bool NewGui::loadNewTheme(const Common::String &style) { if (style.compareToIgnoreCase("classic (builtin)") == 0 || style.compareToIgnoreCase("classic") == 0) { _theme = new ThemeClassic(_system, style); - } else { + } else { if (Theme::themeConfigUseable(style, "", &styleType, &cfg)) { if (0 == styleType.compareToIgnoreCase("classic")) _theme = new ThemeClassic(_system, style, &cfg); @@ -228,7 +227,7 @@ void NewGui::runLoop() { if (_useStdCursor) setupCursor(); } - + Common::EventManager *eventMan = _system->getEventManager(); while (!_dialogStack.empty() && activeDialog == getTopDialog()) { @@ -269,7 +268,7 @@ void NewGui::runLoop() { _themeChange = false; redraw(); } - + switch (event.type) { case Common::EVENT_KEYDOWN: activeDialog->handleKeyDown(event.kbd); |