This commit is contained in:
Steve Checkoway
2006-09-14 07:20:05 +00:00
parent 4dd57b99bd
commit dd0e3ce082
@@ -344,7 +344,7 @@ wchar_t InputHandler_Carbon::DeviceButtonToChar( DeviceButton button, bool bUseC
{ {
default: default:
if( (button >= KEY_F1 && button <= KEY_F16) ) if( (button >= KEY_F1 && button <= KEY_F16) )
return '\0'; return L'\0';
break; break;
case KEY_UP: case KEY_UP:
case KEY_DOWN: case KEY_DOWN:
@@ -363,7 +363,7 @@ wchar_t InputHandler_Carbon::DeviceButtonToChar( DeviceButton button, bool bUseC
case KEY_PGDN: case KEY_PGDN:
case KEY_NUMLOCK: case KEY_NUMLOCK:
case KEY_KP_ENTER: case KEY_KP_ENTER:
return '\0'; return L'\0';
} }
// Find the USB key code for this DeviceButton // Find the USB key code for this DeviceButton
@@ -375,7 +375,7 @@ wchar_t InputHandler_Carbon::DeviceButtonToChar( DeviceButton button, bool bUseC
modifiers = GetCurrentKeyModifiers(); modifiers = GetCurrentKeyModifiers();
static unsigned long state = 0; static unsigned long state = 0;
static Ptr keymap = nil; static Ptr keymap = NULL;
Ptr new_keymap; Ptr new_keymap;
new_keymap = (Ptr)GetScriptManagerVariable(smKCHRCache); new_keymap = (Ptr)GetScriptManagerVariable(smKCHRCache);