Changeset 8071 for code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.cpp

Timestamp:

Mar 14, 2011, 3:53:38 AM (13 years ago)

Author:

rgrieder

Message:

Merged ois_update branch (before it was renamed to mac_osx) into kicklib branch.

Location:

code/branches/kicklib

Files:

• . (modified) (1 prop)
• src/external/ois/win32/Win32KeyBoard.cpp (modified) (3 diffs)

code/branches/kicklib/src/external/ois/win32/Win32KeyBoard.cpp

@@ -21 +21 @@
     3. This notice may not be removed or altered from any source distribution.
 */
-#include "Win32/Win32InputManager.h"
-#include "Win32/Win32KeyBoard.h"
+#include "win32/Win32InputManager.h"
+#include "win32/Win32KeyBoard.h"
 #include "OISException.h"
 #include "OISEvents.h"
@@ -287 +287 @@
 
 //--------------------------------------------------------------------------------------------------//
-const std::string& Win32Keyboard::getAsString( KeyCode kc )
+const std::string& Win32Keyboard::getAsString(KeyCode kc)
 {
         char temp[256];
@@ -297 +297 @@
         prop.diph.dwHow = DIPH_BYOFFSET;
 
-        if ( SUCCEEDED( mKeyboard->GetProperty( DIPROP_KEYNAME, &prop.diph ) ) )
+        if (SUCCEEDED(mKeyboard->GetProperty(DIPROP_KEYNAME, &prop.diph)))
         {
                 // convert the WCHAR in "wsz" to multibyte
-                if ( WideCharToMultiByte( CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL) )
-                        return mGetString.assign( temp );
+                if (WideCharToMultiByte(CP_ACP, 0, prop.wsz, -1, temp, sizeof(temp), NULL, NULL))
+                        return mGetString.assign(temp);
         }
 
         std::stringstream ss;
         ss << "Key_" << (int)kc;
-        return mGetString.assign( ss.str() );
+        return mGetString.assign(ss.str());
 }