From b1f63deba3afe176646dbf9aae5c22cfab453785 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 25 Sep 2010 22:47:00 +0000
Subject: GUI: Partial fix to bug #3075649 Fonts not found with buit-in theme

When the locale font are not found when loading the theme, it now
fallbacks to default language (i.e. English) and default font. For this to work
I had to move the TranslationManager initialization before the Theme is
loaded. Therefore it is now initialized when the GuiManager is constructed.

svn-id: r52896
---
 gui/GuiManager.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'gui/GuiManager.cpp')

diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp
index bbd7718d71..44c6530d7e 100644
--- a/gui/GuiManager.cpp
+++ b/gui/GuiManager.cpp
@@ -62,6 +62,9 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _tooltipCheck(false),
 
 	// Clear the cursor
 	memset(_cursor, 0xFF, sizeof(_cursor));
+		   
+	// Enable translation
+	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
 
 	ConfMan.registerDefault("gui_theme", "scummmodern");
 	Common::String themefile(ConfMan.get("gui_theme"));
-- 
cgit v1.2.3


From 8388e0dfea4ae0d80e51368acd12685c740c5bb5 Mon Sep 17 00:00:00 2001
From: Jordi Vilalta Prat
Date: Tue, 12 Oct 2010 02:18:11 +0000
Subject: JANITORAL: Clean trailing whitespaces.

svn-id: r53160
---
 gui/GuiManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/GuiManager.cpp')

diff --git a/gui/GuiManager.cpp b/gui/GuiManager.cpp
index 44c6530d7e..a2a8654bf6 100644
--- a/gui/GuiManager.cpp
+++ b/gui/GuiManager.cpp
@@ -62,7 +62,7 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _tooltipCheck(false),
 
 	// Clear the cursor
 	memset(_cursor, 0xFF, sizeof(_cursor));
-		   
+
 	// Enable translation
 	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
 
-- 
cgit v1.2.3