From 404c625622c4e706dfed9a62b5480ee4d7a33544 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Thu, 10 Jun 2010 14:18:21 +0000 Subject: Simplify the SCons build: On OS X, build all code as Objective-C(++). Centralize framework handling. Cleanup. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5645 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/InputCommon/Src/EventHandler.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Core/InputCommon/Src/EventHandler.cpp') diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp index 19dc819baf..1fc84065f0 100644 --- a/Source/Core/InputCommon/Src/EventHandler.cpp +++ b/Source/Core/InputCommon/Src/EventHandler.cpp @@ -102,11 +102,11 @@ bool EventHandler::TestEvent (Keys k, sf::Event e) #if defined HAVE_WX && HAVE_WX // Taken from wxw source code -sf::Key::Code EventHandler::wxCharCodeToSF(int id) +sf::Key::Code EventHandler::wxCharCodeToSF(int charcode) { sf::Key::Code sfKey; - switch (id) { + switch (charcode) { // case WXK_CANCEL: sfKey = sf::Key::Cancel; break; // case WXK_BACK: sfKey = sf::Key::BackSpace; break; case WXK_TAB: sfKey = sf::Key::Tab; break; @@ -181,12 +181,12 @@ sf::Key::Code EventHandler::wxCharCodeToSF(int id) default: // To lower (will tolower work on windows?) - if (id >= 'A' && id <= 'Z') - id = id - 'A' + 'a'; + if (charcode >= 'A' && charcode <= 'Z') + charcode = charcode - 'A' + 'a'; - if ((id >= 'a' && id <= 'z') || - (id >= '0' && id <= '9')) - sfKey = (sf::Key::Code)id; + if ((charcode >= 'a' && charcode <= 'z') || + (charcode >= '0' && charcode <= '9')) + sfKey = (sf::Key::Code)charcode; else sfKey = sf::Key::Count; // Invalid key -- cgit v1.2.3