Changeset 85335 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jul 14, 2020 11:47:09 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: CocoaEventHelper.mm + UICocoaDockIconPreview.mm: Can't use MAC_OS_X_VERSION_10_12 for testing with older SDKs. Duh. bugref:9790

Location:

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin

Files:

• CocoaEventHelper.mm (modified) (3 diffs)
• UICocoaDockIconPreview.mm (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm

@@ -27 +27 @@
 /* They just had to rename a whole load of constants in 10.12. Just wrap the carp up
    in some defines for now as we need to keep building with both 10.9 and 10.13+: */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
 # define VBOX_NSAlphaShiftKeyMask    NSEventModifierFlagCapsLock
 # define VBOX_NSAlternateKeyMask     NSEventModifierFlagOption
@@ -216 +216 @@
     NSWindow *pEventWindow = [pEvent window];
     NSInteger iEventWindow = [pEvent windowNumber];
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
     NSGraphicsContext *pEventGraphicsContext = nil; /* NSEvent::context is deprecated and said to always return nil. */
 #else
@@ -344 +344 @@
                                            timestamp:[pEvent timestamp] // [NSDate timeIntervalSinceReferenceDate] ?
                                         windowNumber:[pEvent windowNumber]
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
                                              context:nil /* NSEvent::context is deprecated and said to always return nil. */
 #else

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.mm

@@ -160 +160 @@
 {
     NSImage *dockMonitor = ::darwinToNSImageRef(p->m_dockMonitor);
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
     [dockMonitor drawInRect:NSRectFromCGRect(p->flipRect(p->m_monitorRect)) fromRect:aRect operation:NSCompositingOperationSourceOver fraction:1.0];
 #else