chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Additional change to eb1e900

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-07-13 13:04:29 +03:00
parent eb1e900b20
commit dcdee91670
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Mouse.cpp
View File

@ -19,7 +19,6 @@
#include "StdAfx.h" #include "StdAfx.h"
#include "ConfigParser.h" #include "ConfigParser.h"
#include "MeterWindow.h" #include "MeterWindow.h"
#include "System.h"
#include "Litestep.h" #include "Litestep.h"
#include "Mouse.h" #include "Mouse.h"
@ -51,13 +50,14 @@ void CMouse::ReadOptions(CConfigParser& parser, const WCHAR* section, CMeterWind
m_LeaveAction = parser.ReadString(section, L"MouseLeaveAction", L"", false); m_LeaveAction = parser.ReadString(section, L"MouseLeaveAction", L"", false);
const WCHAR* mouseCursor = parser.ReadString(section, L"MouseActionCursor", L"").c_str(); const WCHAR* mouseCursor = parser.ReadString(section, L"MouseActionCursor", L"").c_str();
if (_wcsicmp(mouseCursor, L"HAND") == 0 || int mouseCursorInt = CConfigParser::ParseInt(mouseCursor, -1); // For backwards compatibility
wcscmp(mouseCursor, L"1") == 0) // For backwards compatibility if (mouseCursorInt == 1 ||
_wcsicmp(mouseCursor, L"HAND") == 0)
{ {
m_CursorType = MOUSECURSOR_HAND; m_CursorType = MOUSECURSOR_HAND;
} }
else if (_wcsicmp(mouseCursor, L"ARROW") == 0 || else if (mouseCursorInt == 0 ||
wcscmp(mouseCursor, L"0") == 0) // For backwards compatibility _wcsicmp(mouseCursor, L"ARROW") == 0)
{ {
m_CursorType = MOUSECURSOR_ARROW; m_CursorType = MOUSECURSOR_ARROW;
} }
@ -81,7 +81,7 @@ void CMouse::ReadOptions(CConfigParser& parser, const WCHAR* section, CMeterWind
{ {
m_CursorType = MOUSECURSOR_PEN; m_CursorType = MOUSECURSOR_PEN;
} }
else if (*mouseCursor) else if (*mouseCursor && wcschr(mouseCursor, L'.'))
{ {
// Load custom cursor // Load custom cursor
std::wstring cursorPath = meterWindow->GetResourcesPath(); std::wstring cursorPath = meterWindow->GetResourcesPath();