BACKENDS/COMMON/GUI: Remove complete support for TaskbarManager when taskbar integration is not enabled

4 files changed, 18 insertions, 2 deletions

diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index a2710bc1cf..4b306be228 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -33,10 +33,11 @@
 ModularBackend::ModularBackend()
 	:
 	_mutexManager(0),
-	_taskbarManager(0),
 	_graphicsManager(0),
 	_mixer(0) {
-
+#if defined(USE_TASKBAR)
+	_taskbarManager = 0;
+#endif
 }
 
 ModularBackend::~ModularBackend() {
@@ -44,8 +45,10 @@ ModularBackend::~ModularBackend() {
 	_graphicsManager = 0;
 	delete _mixer;
 	_mixer = 0;
+#if defined(USE_TASKBAR)
 	delete _taskbarManager;
 	_taskbarManager = 0;
+#endif
 	delete _mutexManager;
 	_mutexManager = 0;
 }
@@ -239,7 +242,10 @@ void ModularBackend::quit() {
 	exit(0);
 }
 
+#if defined(USE_TASKBAR)
 Common::TaskbarManager *ModularBackend::getTaskbarManager() {
 	assert(_taskbarManager);
 	return _taskbarManager;
 }
+#endif
+
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index 6b5bfff989..fab7fb6a4d 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -134,7 +134,9 @@ public:
 	//@{
 
 	virtual void quit();
+#if defined(USE_TASKBAR)
 	virtual TaskbarManager *getTaskbarManager();
+#endif
 	virtual void displayMessageOnOSD(const char *msg);
 
 	//@}
@@ -143,7 +145,9 @@ protected:
 	/** @name Managers variables */
 	//@{
 
+#if defined(USE_TASKBAR)
 	TaskbarManager *_taskbarManager;
+#endif
 	MutexManager *_mutexManager;
 	GraphicsManager *_graphicsManager;
 	Audio::Mixer *_mixer;
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 4743dbb558..85ea177a39 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -126,8 +126,10 @@ void OSystem_SDL::init() {
 	if (_timerManager == 0)
 		_timerManager = new SdlTimerManager();
 
+#if defined(USE_TASKBAR)
 	if (_taskbarManager == 0)
 		_taskbarManager = new Common::TaskbarManager();
+#endif
 
 #ifdef USE_OPENGL
 	// Setup a list with both SDL and OpenGL graphics modes
@@ -213,6 +215,7 @@ void OSystem_SDL::initBackend() {
 	ModularBackend::initBackend();
 }
 
+#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"));
@@ -225,6 +228,7 @@ void OSystem_SDL::engineDone() {
 	// Remove overlay icon
 	_taskbarManager->setOverlayIcon("", "");
 }
+#endif
 
 void OSystem_SDL::initSDL() {
 	// Check if SDL has not been initialized
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index 19f913ef45..395b2b3aac 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -54,8 +54,10 @@ public:
 
 	// Override functions from ModularBackend and OSystem
 	virtual void initBackend();
+#if defined(USE_TASKBAR)
 	virtual void engineInit();
 	virtual void engineDone();
+#endif
 	virtual Common::HardwareKeySet *getHardwareKeySet();
 	virtual void quit();
 	virtual void fatalError();