aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Weissflog <floooh@gmail.com>2021-02-21 14:35:29 +0100
committerAndre Weissflog <floooh@gmail.com>2021-02-21 14:35:29 +0100
commitb0c39720b2ec06ee577cc538c3fb3d76015b2900 (patch)
tree00c4be4385cff2164d58fe9a4442cb85398f3bf4
parente271cac6953b47ec6d9addceeb4ac845d2036b4b (diff)
parent2dc6efd223cee7be1a40af5cdc6e6de3fbc093f8 (diff)
Merge branch 'randrew-app-mac-fix-10.12'
-rw-r--r--sokol_app.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sokol_app.h b/sokol_app.h
index b787d997..eea9a7df 100644
--- a/sokol_app.h
+++ b/sokol_app.h
@@ -3197,7 +3197,9 @@ _SOKOL_PRIVATE void _sapp_macos_frame(void) {
backing:(NSBackingStoreType)backingStoreType
defer:(BOOL)flag {
if (self = [super initWithContentRect:contentRect styleMask:style backing:backingStoreType defer:flag]) {
- [self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeFileURL]];
+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+ [self registerForDraggedTypes:[NSArray arrayWithObject:NSPasteboardTypeFileURL]];
+ #endif
}
return self;
}
@@ -3211,6 +3213,7 @@ _SOKOL_PRIVATE void _sapp_macos_frame(void) {
}
- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
+ #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
NSPasteboard *pboard = [sender draggingPasteboard];
if ([pboard.types containsObject:NSPasteboardTypeFileURL]) {
_sapp_clear_drop_buffer();
@@ -3236,6 +3239,7 @@ _SOKOL_PRIVATE void _sapp_macos_frame(void) {
}
return YES;
}
+ #endif
return NO;
}
@end