diff options
| author | Littleboy | 2011-04-29 12:15:49 -0400 |
|---|---|---|
| committer | Julien | 2011-06-16 14:23:28 -0400 |
| commit | 96148345483dd0e7667f0b7541d5956524181dd5 (patch) | |
| tree | dca875348202dacb8b3a28a5efa1e0b500f3092a /backends/platform | |
| parent | 79fb0ff223588fd7020ef8f133e74f2fdb35f95e (diff) | |
| download | scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.tar.gz scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.tar.bz2 scummvm-rg350-96148345483dd0e7667f0b7541d5956524181dd5.zip | |
BACKENDS/COMMON/GUI: Remove complete support for TaskbarManager when taskbar integration is not enabled
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 2 |
2 files changed, 6 insertions, 0 deletions
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(); |