From 92a71f7452b83b5491ba0862d8da9f23055fd5bd Mon Sep 17 00:00:00 2001
From: agent-q
Date: Sat, 21 May 2011 15:45:51 +0100
Subject: DS: Port of changes from branch-1-2-0 that I should really have moved
 into the trunk.

"DS: Prevent the command line help string from being included in the binary."
5f3a90a5f6911188b8d1ded08dbdf6d233e9eb7b

"GUI: Allow disabling of Mass Add dialog.  Saves a few Kb of binary size on the DS, and is not particularly useful on that platform."
240ff87cf4472538d25a1c5628c8d15f1791ab1c

"GUI: Don't search for theme zip files on startup when running on the DS.  Themes aren't supported anyway, and the search severely delays startup."
fe3b18ce0df03117081e83d99f4a2cbd864d3286
---
 gui/gui-manager.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'gui/gui-manager.cpp')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 19ca66b7b1..edab31dfaa 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -77,6 +77,14 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
 	ConfMan.registerDefault("gui_renderer", ThemeEngine::findModeConfigName(ThemeEngine::_defaultRendererMode));
 	ThemeEngine::GraphicsMode gfxMode = (ThemeEngine::GraphicsMode)ThemeEngine::findMode(ConfMan.get("gui_renderer"));
 
+#ifdef __DS__
+	// Searching for the theme file takes ~10 seconds on the DS.
+	// Disable this search here because external themes are not supported.
+	if (!loadNewTheme("builtin", gfxMode)) {
+		// Loading the built-in theme failed as well. Bail out
+		error("Failed to load any GUI theme, aborting");
+	}
+#else	
 	// Try to load the theme
 	if (!loadNewTheme(themefile, gfxMode)) {
 		// Loading the theme failed, try to load the built-in theme
@@ -85,6 +93,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
 			error("Failed to load any GUI theme, aborting");
 		}
 	}
+#endif
 }
 
 GuiManager::~GuiManager() {
-- 
cgit v1.2.3


From eea482fa4304cab0e23ca4abffdec3651e45f01d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 10:31:37 -0400
Subject: ALL: behaviour -> behavior

---
 gui/gui-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/gui-manager.cpp')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index ef2f89df9c..f56a9097d5 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -297,7 +297,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;
-- 
cgit v1.2.3