| @@ -274,7 +274,7 @@ String File::getVersion() const | |||||
| //============================================================================== | //============================================================================== | ||||
| File File::getLinkedTarget() const | File File::getLinkedTarget() const | ||||
| { | { | ||||
| #if JUCE_IOS || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_5) | |||||
| #if JUCE_IOS || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) | |||||
| NSString* dest = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath: juceStringToNS (getFullPathName()) error: nil]; | NSString* dest = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath: juceStringToNS (getFullPathName()) error: nil]; | ||||
| #else | #else | ||||
| @@ -428,12 +428,12 @@ bool Process::openDocument (const String& fileName, const String& parameters) | |||||
| void File::revealToUser() const | void File::revealToUser() const | ||||
| { | { | ||||
| #if ! JUCE_IOS | |||||
| #if ! JUCE_IOS | |||||
| if (exists()) | if (exists()) | ||||
| [[NSWorkspace sharedWorkspace] selectFile: juceStringToNS (getFullPathName()) inFileViewerRootedAtPath: nsEmptyString()]; | [[NSWorkspace sharedWorkspace] selectFile: juceStringToNS (getFullPathName()) inFileViewerRootedAtPath: nsEmptyString()]; | ||||
| else if (getParentDirectory().exists()) | else if (getParentDirectory().exists()) | ||||
| getParentDirectory().revealToUser(); | getParentDirectory().revealToUser(); | ||||
| #endif | |||||
| #endif | |||||
| } | } | ||||
| //============================================================================== | //============================================================================== | ||||
| @@ -441,7 +441,7 @@ OSType File::getMacOSType() const | |||||
| { | { | ||||
| JUCE_AUTORELEASEPOOL | JUCE_AUTORELEASEPOOL | ||||
| #if JUCE_IOS || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_5) | |||||
| #if JUCE_IOS || (defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) | |||||
| NSDictionary* fileDict = [[NSFileManager defaultManager] attributesOfItemAtPath: juceStringToNS (getFullPathName()) error: nil]; | NSDictionary* fileDict = [[NSFileManager defaultManager] attributesOfItemAtPath: juceStringToNS (getFullPathName()) error: nil]; | ||||
| #else | #else | ||||
| // (the cast here avoids a deprecation warning) | // (the cast here avoids a deprecation warning) | ||||
| @@ -236,7 +236,7 @@ public: | |||||
| { | { | ||||
| r = [[view superview] convertRect: r toView: nil]; | r = [[view superview] convertRect: r toView: nil]; | ||||
| #if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_7 | |||||
| #if defined (MAC_OS_X_VERSION_10_7) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7 | |||||
| r = [window convertRectToScreen: r]; | r = [window convertRectToScreen: r]; | ||||
| #else | #else | ||||
| r.origin = [window convertBaseToScreen: r.origin]; | r.origin = [window convertBaseToScreen: r.origin]; | ||||
| @@ -280,7 +280,7 @@ public: | |||||
| } | } | ||||
| else | else | ||||
| { | { | ||||
| #if defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_5 | |||||
| #if defined (MAC_OS_X_VERSION_10_5) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 | |||||
| [view setAlphaValue: (CGFloat) newAlpha]; | [view setAlphaValue: (CGFloat) newAlpha]; | ||||
| #else | #else | ||||
| if ([view respondsToSelector: @selector (setAlphaValue:)]) | if ([view respondsToSelector: @selector (setAlphaValue:)]) | ||||
| @@ -504,16 +504,18 @@ public: | |||||
| void redirectMouseMove (NSEvent* ev) | void redirectMouseMove (NSEvent* ev) | ||||
| { | { | ||||
| #if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 | |||||
| if ([NSWindow windowNumberAtPoint: [[ev window] convertBaseToScreen: [ev locationInWindow]] | if ([NSWindow windowNumberAtPoint: [[ev window] convertBaseToScreen: [ev locationInWindow]] | ||||
| belowWindowWithWindowNumber: 0] == [window windowNumber]) | |||||
| belowWindowWithWindowNumber: 0] != [window windowNumber]) | |||||
| { | { | ||||
| currentModifiers = currentModifiers.withoutMouseButtons(); | |||||
| sendMouseEvent (ev); | |||||
| showArrowCursorIfNeeded(); | |||||
| [[NSCursor arrowCursor] set]; | |||||
| } | } | ||||
| else | else | ||||
| #endif | |||||
| { | { | ||||
| [[NSCursor arrowCursor] set]; | |||||
| currentModifiers = currentModifiers.withoutMouseButtons(); | |||||
| sendMouseEvent (ev); | |||||
| showArrowCursorIfNeeded(); | |||||
| } | } | ||||
| } | } | ||||
| @@ -804,7 +806,7 @@ public: | |||||
| Rectangle<int> original (convertToRectInt (current)); | Rectangle<int> original (convertToRectInt (current)); | ||||
| const Rectangle<int> screenBounds (Desktop::getInstance().getDisplays().getTotalBounds (true)); | const Rectangle<int> screenBounds (Desktop::getInstance().getDisplays().getTotalBounds (true)); | ||||
| #if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_ALLOWED >= MAC_OS_X_VERSION_10_6 | |||||
| #if defined (MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 | |||||
| if ([window inLiveResize]) | if ([window inLiveResize]) | ||||
| #else | #else | ||||
| if ([window respondsToSelector: @selector (inLiveResize)] | if ([window respondsToSelector: @selector (inLiveResize)] | ||||
| @@ -1239,7 +1239,7 @@ private: | |||||
| void createWindow() | void createWindow() | ||||
| { | { | ||||
| DWORD exstyle = WS_EX_ACCEPTFILES; | |||||
| DWORD exstyle = 0; | |||||
| DWORD type = WS_CLIPSIBLINGS | WS_CLIPCHILDREN; | DWORD type = WS_CLIPSIBLINGS | WS_CLIPCHILDREN; | ||||
| if (hasTitleBar()) | if (hasTitleBar()) | ||||