From 88913c0139ac6d1dfb356d3048702b7bc8ef4079 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 20 Jun 2011 00:59:48 +0200
Subject: ALL: Remove trailing whitespaces

This tries to make our code a bit more compliant with our code formatting
conventions. For future use, this is the command I used:
  git ls-files "*.cpp" "*.h" | xargs sed -i -e 's/[ \t]*$//'
---
 backends/platform/sdl/macosx/macosx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/sdl/macosx/macosx.cpp')

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 9b11eb2c09..817f61e864 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -74,7 +74,7 @@ void OSystem_MacOSX::addSysArchivesToSearchSet(Common::SearchSet &s, int priorit
 }
 
 void OSystem_MacOSX::setupIcon() {
-	// Don't set icon on OS X, as we use a nicer external icon there. 
+	// Don't set icon on OS X, as we use a nicer external icon there.
 }
 
 bool OSystem_MacOSX::hasFeature(Feature f) {
-- 
cgit v1.2.3


From b00586df8253a645d4d7a59b68ffa208cb86ee7c Mon Sep 17 00:00:00 2001
From: CeRiAl
Date: Sun, 3 Jul 2011 22:34:20 +0200
Subject: MACOSX: Add i18n support for Mac OSX application menu

---
 backends/platform/sdl/macosx/macosx.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'backends/platform/sdl/macosx/macosx.cpp')

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 817f61e864..e263192c82 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -29,9 +29,12 @@
 
 #include "backends/platform/sdl/macosx/macosx.h"
 #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h"
+#include "backends/platform/sdl/macosx/appMenu_osx.h"
 
 #include "common/archive.h"
+#include "common/config-manager.h"
 #include "common/fs.h"
+#include "common/translation.h"
 
 #include "ApplicationServices/ApplicationServices.h"	// for LSOpenFSRef
 #include "CoreFoundation/CoreFoundation.h"	// for CF* stuff
@@ -51,6 +54,15 @@ void OSystem_MacOSX::initBackend() {
 		_mixerManager->init();
 	}
 
+#ifdef USE_TRANSLATION
+	// We need to initialize the translataion manager here for the following
+	// call to replaceApplicationMenuItems() work correctly
+	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
+#endif // USE_TRANSLATION
+
+	// Replace the SDL generated menu items with our own translated ones on Mac-OSX
+	replaceApplicationMenuItems();
+
 	// Invoke parent implementation of this method
 	OSystem_POSIX::initBackend();
 }
-- 
cgit v1.2.3


From 554dda7008d905d47420c495481e796c4059772e Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 13 Jul 2011 09:43:16 -0400
Subject: BACKENDS: Fix compilation on case-sensitive Mac OS X

---
 backends/platform/sdl/macosx/macosx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/sdl/macosx/macosx.cpp')

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index e263192c82..4b3d000d34 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -29,7 +29,7 @@
 
 #include "backends/platform/sdl/macosx/macosx.h"
 #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h"
-#include "backends/platform/sdl/macosx/appMenu_osx.h"
+#include "backends/platform/sdl/macosx/appmenu_osx.h"
 
 #include "common/archive.h"
 #include "common/config-manager.h"
-- 
cgit v1.2.3


From 5825ccc16865b9c60d2587b31c50d2ebcc9bab67 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 13 Jul 2011 09:47:03 -0400
Subject: BACKENDS: Fix spelling of 'Mac OS X'

---
 backends/platform/sdl/macosx/macosx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/platform/sdl/macosx/macosx.cpp')

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 4b3d000d34..ddfc99570a 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -60,7 +60,7 @@ void OSystem_MacOSX::initBackend() {
 	TransMan.setLanguage(ConfMan.get("gui_language").c_str());
 #endif // USE_TRANSLATION
 
-	// Replace the SDL generated menu items with our own translated ones on Mac-OSX
+	// Replace the SDL generated menu items with our own translated ones on Mac OS X
 	replaceApplicationMenuItems();
 
 	// Invoke parent implementation of this method
-- 
cgit v1.2.3