aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/win32
diff options
context:
space:
mode:
authorEugene Sandulenko2011-06-22 13:35:37 -0700
committerEugene Sandulenko2011-06-22 13:35:37 -0700
commit33ce6e60fd98ea67e1e6606bfc7d693b27359bd7 (patch)
tree84caf43ce3848e1105a59539f2133471790ce760 /backends/platform/sdl/win32
parentafdfff02f1415f66856f273fcf9f30d7621d8953 (diff)
parent154c584d44d689f0a7b521b49c5ce245a52fb992 (diff)
downloadscummvm-rg350-33ce6e60fd98ea67e1e6606bfc7d693b27359bd7.tar.gz
scummvm-rg350-33ce6e60fd98ea67e1e6606bfc7d693b27359bd7.tar.bz2
scummvm-rg350-33ce6e60fd98ea67e1e6606bfc7d693b27359bd7.zip
Merge pull request #26 from Littleboy/taskbar
Taskbar integration
Diffstat (limited to 'backends/platform/sdl/win32')
-rw-r--r--backends/platform/sdl/win32/win32.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 432f7077ae..5b02a20abc 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -36,6 +36,7 @@
#include "backends/platform/sdl/win32/win32.h"
#include "backends/fs/windows/windows-fs-factory.h"
+#include "backends/taskbar/win32/win32-taskbar.h"
#include "common/memstream.h"
@@ -81,9 +82,14 @@ void OSystem_Win32::init() {
}
#endif
- // Initialze File System Factory
+ // Initialize File System Factory
_fsFactory = new WindowsFilesystemFactory();
+#if defined(USE_TASKBAR)
+ // Initialize taskbar manager
+ _taskbarManager = new Win32TaskbarManager();
+#endif
+
// Invoke parent implementation of this method
OSystem_SDL::init();
}