From f67975a487704828a2005a26ed6725b01c2554db Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Tue, 26 Apr 2011 12:48:01 -0400
Subject: BACKENDS: Add win32 stubs for taskbar integration

---
 backends/platform/sdl/win32/win32.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 5b14be4417..0fd2fbbd1d 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,12 @@ void OSystem_Win32::init() {
 	}
 #endif
 
-	// Initialze File System Factory
+	// Initialize File System Factory
 	_fsFactory = new WindowsFilesystemFactory();
 
+	// Initialize task bar manager
+	_taskbarManager = new Win32TaskbarManager();
+
 	// Invoke parent implementation of this method
 	OSystem_SDL::init();
 }
-- 
cgit v1.2.3


From c0ec09ac66162d253ab16e1fb9b3a85dfdd176d7 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 31 Mar 2011 04:46:36 -0400
Subject: BACKENDS: Implement Win32 taskbar progress state and recent list

---
 backends/platform/sdl/win32/win32.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 0fd2fbbd1d..bb254786d5 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -87,6 +87,7 @@ void OSystem_Win32::init() {
 
 	// Initialize task bar manager
 	_taskbarManager = new Win32TaskbarManager();
+	((Win32TaskbarManager *)_taskbarManager)->init();
 
 	// Invoke parent implementation of this method
 	OSystem_SDL::init();
-- 
cgit v1.2.3


From c3d9c6afa57055705849359deaac7c5748d66fe1 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 1 Apr 2011 01:30:12 -0400
Subject: BACKENDS: Add use flag for taskbar integration

---
 backends/platform/sdl/win32/win32.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index bb254786d5..0a6702b6d9 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -85,9 +85,11 @@ void OSystem_Win32::init() {
 	// Initialize File System Factory
 	_fsFactory = new WindowsFilesystemFactory();
 
-	// Initialize task bar manager
+#if defined(USE_TASKBAR)
+	// Initialize taskbar manager
 	_taskbarManager = new Win32TaskbarManager();
 	((Win32TaskbarManager *)_taskbarManager)->init();
+#endif
 
 	// Invoke parent implementation of this method
 	OSystem_SDL::init();
-- 
cgit v1.2.3


From 5649ddaf101db5d8ce70e9ba1bfda850c5d00aa5 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Mon, 4 Apr 2011 16:10:58 -0400
Subject: BACKENDS: Move Win32TaskbarManager init code to constructor

---
 backends/platform/sdl/win32/win32.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'backends/platform/sdl/win32')

diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index 0a6702b6d9..08139f0dc2 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -88,7 +88,6 @@ void OSystem_Win32::init() {
 #if defined(USE_TASKBAR)
 	// Initialize taskbar manager
 	_taskbarManager = new Win32TaskbarManager();
-	((Win32TaskbarManager *)_taskbarManager)->init();
 #endif
 
 	// Invoke parent implementation of this method
-- 
cgit v1.2.3