aboutsummaryrefslogtreecommitdiff
path: root/gui/gui-manager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/gui-manager.cpp')
-rw-r--r--gui/gui-manager.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index edab31dfaa..af1852d56d 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -17,9 +17,6 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
*/
#include "common/events.h"
@@ -84,7 +81,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
// Loading the built-in theme failed as well. Bail out
error("Failed to load any GUI theme, aborting");
}
-#else
+#else
// Try to load the theme
if (!loadNewTheme(themefile, gfxMode)) {
// Loading the theme failed, try to load the built-in theme
@@ -309,7 +306,7 @@ void GuiManager::runLoop() {
// dialog-related events since they were probably generated while the old dialog
// was still visible, and therefore not intended for the new one.
//
- // This hopefully fixes strange behaviour/crashes with pop-up widgets. (Most easily
+ // This hopefully fixes strange behavior/crashes with pop-up widgets. (Most easily
// triggered in 3x mode or when running ScummVM under Valgrind.)
if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED)
continue;