rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge 1.3 r894:895 into 1.4 and trunk

This commit is contained in:
Nick Bolton 2011-01-24 17:00:54 +00:00
parent 556422516c
commit 1ec74a535f
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/platform/COSXKeyState.cpp
View File

@ -279,7 +279,7 @@ COSXKeyState::mapKeyFromEvent(CKeyIDs& ids,
#else #else
const void* resource; const void* resource;
int err = KLGetKeyboardLayoutProperty(currentKeyboardLayout, kKLuchrData, &resource); int err = KLGetKeyboardLayoutProperty(currentKeyboardLayout, kKLuchrData, &resource);
const bool layoutValid == (err == noErr); const bool layoutValid = (err == noErr);
const UCKeyboardLayout* layout = (const UCKeyboardLayout*)resource; const UCKeyboardLayout* layout = (const UCKeyboardLayout*)resource;
#endif #endif
@ -418,21 +418,6 @@ COSXKeyState::getKeyMap(CKeyMap& keyMap)
} }
} }
// NB: not sure why support for KCHR was
// remvoed in 10.5 version?
#if !defined(MAC_OS_X_VERSION_10_5)
// try KCHR resource
if (KLGetKeyboardLayoutProperty(m_groups[g],
kKLKCHRData, &resource) == noErr) {
CKCHRKeyResource kchr(resource);
if (kchr.isValid()) {
LOG((CLOG_DEBUG1 "using KCHR resource for group %d", g));
getKeyMap(keyMap, g, kchr);
continue;
}
}
#endif
LOG((CLOG_DEBUG1 "no keyboard resource for group %d", g)); LOG((CLOG_DEBUG1 "no keyboard resource for group %d", g));
} }
} }