[Scummvm-cvs-logs] SF.net SVN: scummvm:[54828] scummvm/trunk

[lordhoto at users.sourceforge.net]

Revision: 54828
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54828&view=rev
Author:   lordhoto
Date:     2010-12-08 01:35:34 +0000 (Wed, 08 Dec 2010)

Log Message:
-----------
BACKENDS: Fix OSD implementation in ModularBackend.

Modified Paths:
--------------
    scummvm/trunk/backends/modular-backend.cpp
    scummvm/trunk/common/system.h

Modified: scummvm/trunk/backends/modular-backend.cpp
===================================================================
--- scummvm/trunk/backends/modular-backend.cpp	2010-12-08 01:35:12 UTC (rev 54827)
+++ scummvm/trunk/backends/modular-backend.cpp	2010-12-08 01:35:34 UTC (rev 54828)
@@ -264,12 +264,7 @@
 }
 
 void ModularBackend::displayMessageOnOSD(const char *msg) {
-#ifdef USE_OSD
 	_graphicsManager->displayMessageOnOSD(msg);
-#else
-	GUI::TimedMessageDialog dialog(msg, 1500);
-	dialog.runModal();
-#endif
 }
 
 Common::SaveFileManager *ModularBackend::getSavefileManager() {

Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h	2010-12-08 01:35:12 UTC (rev 54827)
+++ scummvm/trunk/common/system.h	2010-12-08 01:35:34 UTC (rev 54828)
@@ -987,8 +987,9 @@
 	 *
 	 * Currently, only pure ASCII messages can be expected to show correctly.
 	 *
-	 * @note There is a default implementation which uses a TimedMessageDialog
-	 *       to display the message. Hence implementing this is optional.
+	 * @note There is a default implementation in BaseBackend which uses a
+	 *       TimedMessageDialog to display the message. Hence implementing
+	 *       this is optional.
 	 *
 	 * @param msg	the message to display on screen
 	 */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.