[Scummvm-cvs-logs] SF.net SVN: scummvm:[50476] scummvm/branches/gsoc2010-opengl/backends/ platform
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Tue Jun 29 03:59:12 CEST 2010
Revision: 50476
http://scummvm.svn.sourceforge.net/scummvm/?rev=50476&view=rev
Author: mthreepwood
Date: 2010-06-29 01:59:10 +0000 (Tue, 29 Jun 2010)
Log Message:
-----------
Override setupIcon() for both Mac OS X and SymbianOS, they have their own icons.
Modified Paths:
--------------
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.cpp
scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.h
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp 2010-06-29 01:21:30 UTC (rev 50475)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.cpp 2010-06-29 01:59:10 UTC (rev 50476)
@@ -69,4 +69,8 @@
}
}
+void OSystem_MacOSX::setupIcon() {
+ // Don't set icon on OS X, as we use a nicer external icon there.
+}
+
#endif
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h 2010-06-29 01:21:30 UTC (rev 50475)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/sdl/macosx/macosx.h 2010-06-29 01:59:10 UTC (rev 50476)
@@ -35,6 +35,7 @@
void initBackend();
void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
+ void setupIcon();
};
#endif
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.cpp 2010-06-29 01:21:30 UTC (rev 50475)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.cpp 2010-06-29 01:59:10 UTC (rev 50476)
@@ -178,6 +178,10 @@
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;
}
Modified: scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.h 2010-06-29 01:21:30 UTC (rev 50475)
+++ scummvm/branches/gsoc2010-opengl/backends/platform/symbian/src/SymbianOS.h 2010-06-29 01:59:10 UTC (rev 50476)
@@ -42,6 +42,7 @@
void engineDone();
bool setGraphicsMode(const char *name);
Common::String getDefaultConfigFileName();
+ void setupIcon();
// Returns reference to File session
RFs& FsSession();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list