Changeset 85334 in vbox

Timestamp:

Jul 14, 2020 11:07:53 AM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139314

Message:

FE/Qt: CocoaEventHelper.mm - NSEvent::context is deprecated and said to always return nil starting with 10.12, so just take it's value as nil in the two places we use it here. bugref:9790

File:

• trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/CocoaEventHelper.mm (modified) (2 diffs)

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

@@ -216 +216 @@
     NSWindow *pEventWindow = [pEvent window];
     NSInteger iEventWindow = [pEvent windowNumber];
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+    NSGraphicsContext *pEventGraphicsContext = nil; /* NSEvent::context is deprecated and said to always return nil. */
+#else
     NSGraphicsContext *pEventGraphicsContext = [pEvent context];
+#endif
 
     printf("%s%p: Type=%lu Modifiers=%08lx pWindow=%p #Wnd=%ld pGraphCtx=%p %s\n",
@@ -340 +344 @@
                                            timestamp:[pEvent timestamp] // [NSDate timeIntervalSinceReferenceDate] ?
                                         windowNumber:[pEvent windowNumber]
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_12
+                                             context:nil /* NSEvent::context is deprecated and said to always return nil. */
+#else
                                              context:[pEvent context]
+#endif
                                          eventNumber:[pEvent eventNumber]
                                           clickCount:[pEvent clickCount]