From d1ba056b0f9bf855d21d82245761949d11b65650 Mon Sep 17 00:00:00 2001 From: LaurentGom Date: Mon, 22 Feb 2010 15:43:15 +0000 Subject: [PATCH] I forgot to update the VS2005 and Code::Blocks projects in last commit :) git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1418 4e206d99-4929-0410-ac5d-dfc041789085 --- build/codeblocks/SFML.workspace | 4 ++-- build/codeblocks/sfml-system.cbp | 2 ++ build/vc2005/sfml-system.vcproj | 8 ++++++++ src/SFML/Window/Win32/WindowImplWin32.cpp | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build/codeblocks/SFML.workspace b/build/codeblocks/SFML.workspace index ba1c72691..deb7b6704 100644 --- a/build/codeblocks/SFML.workspace +++ b/build/codeblocks/SFML.workspace @@ -1,12 +1,12 @@ - + - + diff --git a/build/codeblocks/sfml-system.cbp b/build/codeblocks/sfml-system.cbp index cd28ba507..ae621ca7d 100644 --- a/build/codeblocks/sfml-system.cbp +++ b/build/codeblocks/sfml-system.cbp @@ -90,6 +90,7 @@ + @@ -110,6 +111,7 @@ + diff --git a/build/vc2005/sfml-system.vcproj b/build/vc2005/sfml-system.vcproj index dcfaef043..21e93979f 100644 --- a/build/vc2005/sfml-system.vcproj +++ b/build/vc2005/sfml-system.vcproj @@ -382,6 +382,14 @@ RelativePath="..\..\include\SFML\System\Clock.hpp" > + + + + diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp index d651b6248..b16eee317 100644 --- a/src/SFML/Window/Win32/WindowImplWin32.cpp +++ b/src/SFML/Window/Win32/WindowImplWin32.cpp @@ -674,7 +674,7 @@ Key::Code WindowImplWin32::VirtualKeyCodeToSF(WPARAM key, LPARAM flags) case VK_SHIFT : { static UINT lShift = MapVirtualKey(VK_LSHIFT, MAPVK_VK_TO_VSC); - UINT scancode = (flags & (0xFF << 16)) >> 16; + UINT scancode = static_cast((flags & (0xFF << 16)) >> 16); return scancode == lShift ? Key::LShift : Key::RShift; }