thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #26 from Littleboy/taskbar

Browse source 
Taskbar integration
This commit is contained in:
Eugene Sandulenko 2011-06-22 13:35:37 -07:00
commit 33ce6e60fd
17 changed files with 961 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
common/system.cpp
View file

@ -27,6 +27,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"
@ -40,6 +41,9 @@ OSystem::OSystem() {
_eventManager = 0;
_timerManager = 0;
_savefileManager = 0;
#if defined(USE_TASKBAR)
_taskbarManager = 0;
#endif
_fsFactory = 0;
}
@ -53,6 +57,11 @@ OSystem::~OSystem() {
delete _timerManager;
_timerManager = 0;
#if defined(USE_TASKBAR)
delete _taskbarManager;
_taskbarManager = 0;
#endif
delete _savefileManager;
_savefileManager = 0;