[Scummvm-cvs-logs] scummvm master -> 33ce6e60fd98ea67e1e6606bfc7d693b27359bd7

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
33ce6e60fd Merge pull request #26 from Littleboy/taskbar


Commit: 33ce6e60fd98ea67e1e6606bfc7d693b27359bd7
    https://github.com/scummvm/scummvm/commit/33ce6e60fd98ea67e1e6606bfc7d693b27359bd7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-06-22T13:35:37-07:00

Commit Message:
Merge pull request #26 from Littleboy/taskbar

Taskbar integration

Changed paths:
  A backends/taskbar/unity/unity-taskbar.cpp
  A backends/taskbar/unity/unity-taskbar.h
  A backends/taskbar/win32/mingw-compat.h
  A backends/taskbar/win32/win32-taskbar.cpp
  A backends/taskbar/win32/win32-taskbar.h
  A common/taskbar.h
    backends/module.mk
    backends/platform/sdl/posix/posix.cpp
    backends/platform/sdl/sdl.cpp
    backends/platform/sdl/sdl.h
    backends/platform/sdl/win32/win32.cpp
    common/system.cpp
    common/system.h
    configure
    devtools/create_project/create_project.cpp
    gui/massadd.cpp
    gui/massadd.h



diff --cc backends/platform/sdl/sdl.cpp
index ecaeabf,85ea177..3f85b1a
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@@ -191,20 -213,23 +197,35 @@@ void OSystem_SDL::initBackend() 
  	_inited = true;
  
  	ModularBackend::initBackend();
 +
 +	// We have to initialize the graphics manager before the event manager
 +	// so the virtual keyboard can be initialized, but we have to add the
 +	// graphics manager as an event observer after initializing the event
 +	// manager.
 +	if (graphicsManagerType == 0)
 +		((SurfaceSdlGraphicsManager *)_graphicsManager)->initEventObserver();
 +#ifdef USE_OPENGL
 +	else if (graphicsManagerType == 1)
 +		((OpenGLSdlGraphicsManager *)_graphicsManager)->initEventObserver();
 +#endif
 +
  }
  
+ #if defined(USE_TASKBAR)
+ void OSystem_SDL::engineInit() {
+ 	// Add the started engine to the list of recent tasks
+ 	_taskbarManager->addRecent(ConfMan.getActiveDomainName(), ConfMan.get("description"));
+ 
+ 	// Set the overlay icon the current running engine
+ 	_taskbarManager->setOverlayIcon(ConfMan.getActiveDomainName(), ConfMan.get("description"));
+ }
+ 
+ void OSystem_SDL::engineDone() {
+ 	// Remove overlay icon
+ 	_taskbarManager->setOverlayIcon("", "");
+ }
+ #endif
+ 
  void OSystem_SDL::initSDL() {
  	// Check if SDL has not been initialized
  	if (!_initedSDL) {