diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/system.cpp | 9 | ||||
| -rw-r--r-- | common/system.h | 15 |
2 files changed, 22 insertions, 2 deletions
diff --git a/common/system.cpp b/common/system.cpp index fae7a3ef34..2dab687872 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -32,6 +32,7 @@ #include "common/fs.h" #include "common/savefile.h" #include "common/str.h" +#include "common/taskbar.h" #include "common/textconsole.h" #include "backends/audiocd/default/default-audiocd.h" @@ -45,6 +46,9 @@ OSystem::OSystem() { _eventManager = 0; _timerManager = 0; _savefileManager = 0; +#if defined(USE_TASKBAR) + _taskbarManager = 0; +#endif _fsFactory = 0; } @@ -58,6 +62,11 @@ OSystem::~OSystem() { delete _timerManager; _timerManager = 0; +#if defined(USE_TASKBAR) + delete _taskbarManager; + _taskbarManager = 0; +#endif + delete _savefileManager; _savefileManager = 0; diff --git a/common/system.h b/common/system.h index 0bfa980800..24728a918c 100644 --- a/common/system.h +++ b/common/system.h @@ -43,7 +43,7 @@ class SaveFileManager; class SearchSet; class String; #if defined(USE_TASKBAR) - class TaskbarManager; +class TaskbarManager; #endif class TimerManager; class SeekableReadStream; @@ -152,6 +152,15 @@ protected: */ Common::SaveFileManager *_savefileManager; +#if defined(USE_TASKBAR) + /** + * No default value is provided for _savefileManager by OSystem. + * + * @note _savefileManager is deleted by the OSystem destructor. + */ + Common::TaskbarManager *_taskbarManager; +#endif + /** * No default value is provided for _fsFactory by OSystem. * @@ -1057,7 +1066,9 @@ public: * * @return the TaskbarManager for the current architecture */ - virtual Common::TaskbarManager *getTaskbarManager() = 0; + virtual Common::TaskbarManager *getTaskbarManager() { + return _taskbarManager; + } #endif /** |