From 6f1d116279022ec2421da1c5c8dffad7cda33714 Mon Sep 17 00:00:00 2001 From: reuk Date: Tue, 10 Jun 2025 12:05:50 +0100 Subject: [PATCH] macOS: Add initial macOS 26 suport --- modules/juce_core/native/juce_SystemStats_mac.mm | 4 ++++ modules/juce_core/system/juce_SystemStats.h | 1 + .../juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm | 3 +++ 3 files changed, 8 insertions(+) diff --git a/modules/juce_core/native/juce_SystemStats_mac.mm b/modules/juce_core/native/juce_SystemStats_mac.mm index e46b6847ac..a5683dc909 100644 --- a/modules/juce_core/native/juce_SystemStats_mac.mm +++ b/modules/juce_core/native/juce_SystemStats_mac.mm @@ -150,6 +150,10 @@ SystemStats::OperatingSystemType SystemStats::getOperatingSystemType() case 13: return MacOS_13; case 14: return MacOS_14; case 15: return MacOS_15; + + case 16: + case 26: + return MacOS_26; } return MacOSX; diff --git a/modules/juce_core/system/juce_SystemStats.h b/modules/juce_core/system/juce_SystemStats.h index 8e6b6cc8f5..31d1aa410f 100644 --- a/modules/juce_core/system/juce_SystemStats.h +++ b/modules/juce_core/system/juce_SystemStats.h @@ -79,6 +79,7 @@ public: MacOS_13 = MacOSX | 18, MacOS_14 = MacOSX | 19, MacOS_15 = MacOSX | 20, + MacOS_26 = MacOSX | 21, Win2000 = Windows | 1, WinXP = Windows | 2, diff --git a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm index d1a28d9acb..53ed34ebbf 100644 --- a/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm +++ b/modules/juce_gui_basics/native/juce_NSViewComponentPeer_mac.mm @@ -1932,6 +1932,9 @@ private: case NSEventTypeRightMouseUp: case NSEventTypeOtherMouseUp: case NSEventTypeOtherMouseDragged: + #if JUCE_MAC_API_VERSION_CAN_BE_BUILT (26, 0) + case NSEventTypeMouseCancelled: + #endif if (Desktop::getInstance().getDraggingMouseSource (0) != nullptr) return false; break;