Merge pull request #511 from keeganquinn/elcapitan-build-fix
Cast values to fix build errors on OS X 10.11.
This commit is contained in:
commit
13ac24821a
|
@ -337,26 +337,26 @@ OSXKeyState::fakeMediaKey(KeyID id)
|
||||||
CGEventFlags
|
CGEventFlags
|
||||||
OSXKeyState::getModifierStateAsOSXFlags()
|
OSXKeyState::getModifierStateAsOSXFlags()
|
||||||
{
|
{
|
||||||
CGEventFlags modifiers = 0;
|
CGEventFlags modifiers = CGEventFlags(0);
|
||||||
|
|
||||||
if (m_shiftPressed) {
|
if (m_shiftPressed) {
|
||||||
modifiers |= kCGEventFlagMaskShift;
|
modifiers |= CGEventFlags(kCGEventFlagMaskShift);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_controlPressed) {
|
if (m_controlPressed) {
|
||||||
modifiers |= kCGEventFlagMaskControl;
|
modifiers |= CGEventFlags(kCGEventFlagMaskControl);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_altPressed) {
|
if (m_altPressed) {
|
||||||
modifiers |= kCGEventFlagMaskAlternate;
|
modifiers |= CGEventFlags(kCGEventFlagMaskAlternate);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_superPressed) {
|
if (m_superPressed) {
|
||||||
modifiers |= kCGEventFlagMaskCommand;
|
modifiers |= CGEventFlags(kCGEventFlagMaskCommand);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_capsPressed) {
|
if (m_capsPressed) {
|
||||||
modifiers |= kCGEventFlagMaskAlphaShift;
|
modifiers |= CGEventFlags(kCGEventFlagMaskAlphaShift);
|
||||||
}
|
}
|
||||||
|
|
||||||
return modifiers;
|
return modifiers;
|
||||||
|
|
Loading…
Reference in New Issue