AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adapting to new raw_control constants, see #13695

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70251 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2012-01-03 10:34:14 +00:00
parent 59cd3bbd6c
commit ed1ebd3908
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/core/hid.cpp
View File

@ -421,7 +421,7 @@ enum
WXK_RSHIFT = 400,
WXK_RALT,
WXK_RCONTROL,
WXK_RMENU
WXK_RAW_RCONTROL,
};
// ----------------------------------------------------------------------------
@ -601,7 +601,7 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
//Menu keys, Shift, other specials
case kHIDUsage_KeyboardLeftControl:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_CONTROL);
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RAW_CONTROL);
break;
case kHIDUsage_KeyboardLeftShift:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_SHIFT);
@ -610,10 +610,10 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_ALT);
break;
case kHIDUsage_KeyboardLeftGUI:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_MENU);
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_CONTROL);
break;
case kHIDUsage_KeyboardRightControl:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RCONTROL);
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RAW_RCONTROL);
break;
case kHIDUsage_KeyboardRightShift:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RSHIFT);
@ -622,7 +622,7 @@ void wxHIDKeyboard::DoBuildCookies(CFArrayRef Array)
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RALT);
break;
case kHIDUsage_KeyboardRightGUI:
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RMENU);
AddCookie(CFArrayGetValueAtIndex(Array, i),WXK_RCONTROL);
break;
//Default
@ -723,9 +723,9 @@ bool wxGetKeyState (wxKeyCode key)
return true;
}
break;
case WXK_MENU:
if( keyboard->IsActive(WXK_MENU) ||
keyboard->IsActive(WXK_RMENU) )
case WXK_RAW_CONTROL:
if( keyboard->IsActive(WXK_RAW_CONTROL) ||
keyboard->IsActive(WXK_RAW_RCONTROL) )
{
return true;
}