aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar/win32/win32-taskbar.cpp
diff options
context:
space:
mode:
authorLittleboy2011-04-04 12:35:19 -0400
committerJulien2011-06-16 14:22:51 -0400
commit6c14d8a95052b68c9f076d32e520c6befac3d959 (patch)
tree065d18cf4d35158c62ba6a39ec0029dc564d46c4 /backends/taskbar/win32/win32-taskbar.cpp
parentcd09b7e74fd9552901505082166b679c39f85ccc (diff)
downloadscummvm-rg350-6c14d8a95052b68c9f076d32e520c6befac3d959.tar.gz
scummvm-rg350-6c14d8a95052b68c9f076d32e520c6befac3d959.tar.bz2
scummvm-rg350-6c14d8a95052b68c9f076d32e520c6befac3d959.zip
BACKENDS: Integrate glib main event loop
- Unity needs a glib event loop to dispatch events. - Cleanup whitespace and indentation
Diffstat (limited to 'backends/taskbar/win32/win32-taskbar.cpp')
-rw-r--r--backends/taskbar/win32/win32-taskbar.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 91c4e2399c..c630129ea9 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -28,13 +28,13 @@
// Needed for taskbar functions
#if defined(__GNUC__)
#ifdef __MINGW32__
- #include "backends/taskbar/win32/mingw-compat.h"
+ #include "backends/taskbar/win32/mingw-compat.h"
#else
- #error Only compilation with MingW is supported
+ #error Only compilation with MingW is supported
#endif
#else
- // Default MSVC headers for ITaskbarList3 and IShellLink
- #include <SDKDDKVer.h>
+ // Default MSVC headers for ITaskbarList3 and IShellLink
+ #include <SDKDDKVer.h>
#endif
#include <shlobj.h>
@@ -71,10 +71,10 @@ void Win32TaskbarManager::init() {
// Try creating instance (on fail, _taskbar will contain NULL)
HRESULT hr = CoCreateInstance(CLSID_TaskbarList,
- 0,
- CLSCTX_INPROC_SERVER,
- IID_ITaskbarList3,
- reinterpret_cast<void**> (&(_taskbar)));
+ 0,
+ CLSCTX_INPROC_SERVER,
+ IID_ITaskbarList3,
+ reinterpret_cast<void**> (&(_taskbar)));
if (SUCCEEDED(hr)) {
// Initialize taskbar object
@@ -105,8 +105,8 @@ void Win32TaskbarManager::setOverlayIcon(const Common::String &name, const Commo
HICON pIcon = (HICON)::LoadImage(NULL, path.c_str(), IMAGE_ICON, 16, 16, LR_LOADFROMFILE);
if (!pIcon) {
- warning("[Win32TaskbarManager::setOverlayIcon] Cannot load icon!");
- return;
+ warning("[Win32TaskbarManager::setOverlayIcon] Cannot load icon!");
+ return;
}
// Sets the overlay icon
@@ -206,18 +206,18 @@ Common::String Win32TaskbarManager::getIconPath(Common::String target) {
}
bool Win32TaskbarManager::isWin7OrLater() {
- OSVERSIONINFOEX versionInfo;
- DWORDLONG conditionMask = 0;
+ OSVERSIONINFOEX versionInfo;
+ DWORDLONG conditionMask = 0;
- ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEX));
- versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
- versionInfo.dwMajorVersion = 6;
- versionInfo.dwMinorVersion = 1;
+ ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEX));
+ versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+ versionInfo.dwMajorVersion = 6;
+ versionInfo.dwMinorVersion = 1;
- VER_SET_CONDITION(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
- VER_SET_CONDITION(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
- return VerifyVersionInfo(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask);
+ return VerifyVersionInfo(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask);
}
LPWSTR Win32TaskbarManager::ansiToUnicode(const char *s) {