X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77aa5fa0275909c411620e2cdf8aa7ce47eecef9..29c829ba84c29a33f5fac69de94513bc174e35c2:/src/osx/cocoa/utils.mm?ds=inline diff --git a/src/osx/cocoa/utils.mm b/src/osx/cocoa/utils.mm index 9f57601f84..ac0909b64d 100644 --- a/src/osx/cocoa/utils.mm +++ b/src/osx/cocoa/utils.mm @@ -54,8 +54,8 @@ void wxBell() - (void)applicationWillFinishLaunching:(NSNotification *)application { wxUnusedVar(application); - // we must install our handlers later than setting the app delegates, because otherwise our handlers - // get overwritten + // we must install our handlers later than setting the app delegate, because otherwise our handlers + // get overwritten in the meantime NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager]; @@ -305,10 +305,10 @@ wxMouseState wxGetMouseState() ms.SetMiddleDown( (buttons & 0x04) != 0 ); ms.SetRightDown( (buttons & 0x02) != 0 ); - ms.SetControlDown(modifiers & NSControlKeyMask); + ms.SetRawControlDown(modifiers & NSControlKeyMask); ms.SetShiftDown(modifiers & NSShiftKeyMask); ms.SetAltDown(modifiers & NSAlternateKeyMask); - ms.SetMetaDown(modifiers & NSCommandKeyMask); + ms.SetControlDown(modifiers & NSCommandKeyMask); return ms; }