From d2d32e1abf06fbf0c1b06a1c8df6021d4821bf53 Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 28 Oct 2013 21:50:05 +0000 Subject: [PATCH] Fix for mouse cursor in OSX 10.9 --- .../juce_gui_basics/native/juce_mac_MouseCursor.mm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/juce_gui_basics/native/juce_mac_MouseCursor.mm b/modules/juce_gui_basics/native/juce_mac_MouseCursor.mm index 5686bfc17a..b09fcc47d1 100644 --- a/modules/juce_gui_basics/native/juce_mac_MouseCursor.mm +++ b/modules/juce_gui_basics/native/juce_mac_MouseCursor.mm @@ -62,7 +62,6 @@ namespace MouseCursorHelpers return CustomMouseCursorInfo (im, (int) (hx * im.getWidth()), (int) (hy * im.getHeight())).create(); - jassertfalse; return nullptr; } } @@ -95,7 +94,16 @@ void* MouseCursor::createStandardMouseCursor (MouseCursor::StandardCursorType ty case LeftEdgeResizeCursor: c = [NSCursor resizeLeftCursor]; break; case RightEdgeResizeCursor: c = [NSCursor resizeRightCursor]; break; case CrosshairCursor: c = [NSCursor crosshairCursor]; break; - case CopyingCursor: return MouseCursorHelpers::fromWebKitFile ("copyCursor.png", 0, 0); + + case CopyingCursor: + { + #if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 + if (void* m = MouseCursorHelpers::fromWebKitFile ("copyCursor.png", 0, 0)) + return m; + #endif + c = [NSCursor dragCopyCursor]; // added in 10.6 + break; + } case UpDownResizeCursor: case TopEdgeResizeCursor: