From 851bfba6f24691c3790dffc565a2e93335dbefd9 Mon Sep 17 00:00:00 2001 From: avihal Date: Mon, 12 Sep 2011 16:35:30 +0000 Subject: [PATCH] UI: Bugfix: normal keys were not handled by PCSX2 (can now be used as KB shortcuts, etc). git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4918 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/gui/AppMain.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcsx2/gui/AppMain.cpp b/pcsx2/gui/AppMain.cpp index a6c6016593..29886355df 100644 --- a/pcsx2/gui/AppMain.cpp +++ b/pcsx2/gui/AppMain.cpp @@ -231,7 +231,7 @@ void Pcsx2App::PadKeyDispatch( const keyEvent& ev ) const bool isDown = (ev.evt == KEYPRESS); #ifdef __WXMSW__ - const int vkey = wxCharCodeMSWToWX( ev.key ); + const int vkey = wxCharCodeMSWToWX( ev.key ); //returns 0 if plain ascii value or a WXK_... (<=32 or >=300) if a special key #elif defined( __WXGTK__ ) const int vkey = TranslateGDKtoWXK( ev.key ); #else @@ -247,7 +247,7 @@ void Pcsx2App::PadKeyDispatch( const keyEvent& ev ) case WXK_MENU: m_kevt.m_altDown = isDown; return; } - m_kevt.m_keyCode = vkey; + m_kevt.m_keyCode = vkey? vkey : ev.key; if( m_kevt.GetEventType() == wxEVT_KEY_DOWN ) {