From cd5546f1d16c9efe471206846ddfdcd3b81f4f63 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 29 Jun 2010 01:59:10 +0000
Subject: Override setupIcon() for both Mac OS X and SymbianOS, they have their
 own icons.

svn-id: r50476
---
 backends/platform/sdl/macosx/macosx.cpp     | 4 ++++
 backends/platform/sdl/macosx/macosx.h       | 1 +
 backends/platform/symbian/src/SymbianOS.cpp | 4 ++++
 backends/platform/symbian/src/SymbianOS.h   | 1 +
 4 files changed, 10 insertions(+)

(limited to 'backends/platform')

diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 8cbdae7aa7..a36769b417 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -69,4 +69,8 @@ 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. 
+}
+
 #endif
diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h
index e3a819f592..1febd1a51d 100644
--- a/backends/platform/sdl/macosx/macosx.h
+++ b/backends/platform/sdl/macosx/macosx.h
@@ -35,6 +35,7 @@ public:
 
 	void initBackend();
 	void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+	void setupIcon();
 };
 
 #endif
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 2195b897d1..abb067e60b 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -178,6 +178,10 @@ Common::String OSystem_SDL_Symbian::getDefaultConfigFileName() {
 	return configFile;
 }
 
+void OSystem_SDL_Symbian::setupIcon() {
+	// Don't for Symbian: it uses the EScummVM.aif file for the icon. 
+}
+
 RFs& OSystem_SDL_Symbian::FsSession() {
 	return *_RFs;
 }
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index 4faec71865..6c89779e89 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -42,6 +42,7 @@ public:
 	void engineDone();
 	bool setGraphicsMode(const char *name);
 	Common::String getDefaultConfigFileName();
+	void setupIcon();
 
 	// Returns reference to File session
 	RFs& FsSession();
-- 
cgit v1.2.3