macOS: Replace PboardTypes with PasteboardTypes.
Related to {T103758}. - NSStringPboardType is replaced by NSPasteboardTypeString - NSTIFFPboardType is replaced by NSPasteboardTypeTIFF
This commit is contained in:
parent
3590e263e0
commit
eeff49a3b1
@ -1949,7 +1949,7 @@ char *GHOST_SystemCocoa::getClipboard(bool selection) const
|
||||
|
||||
NSPasteboard *pasteBoard = [NSPasteboard generalPasteboard];
|
||||
|
||||
NSString *textPasted = [pasteBoard stringForType:NSStringPboardType];
|
||||
NSString *textPasted = [pasteBoard stringForType:NSPasteboardTypeString];
|
||||
|
||||
if (textPasted == nil) {
|
||||
return NULL;
|
||||
@ -1984,8 +1984,8 @@ void GHOST_SystemCocoa::putClipboard(const char *buffer, bool selection) const
|
||||
@autoreleasepool {
|
||||
|
||||
NSPasteboard *pasteBoard = NSPasteboard.generalPasteboard;
|
||||
[pasteBoard declareTypes:@[ NSStringPboardType ] owner:nil];
|
||||
[pasteBoard declareTypes:@[ NSPasteboardTypeString ] owner:nil];
|
||||
NSString *textToCopy = [NSString stringWithCString:buffer encoding:NSUTF8StringEncoding];
|
||||
[pasteBoard setString:textToCopy forType:NSStringPboardType];
|
||||
[pasteBoard setString:textToCopy forType:NSPasteboardTypeString];
|
||||
}
|
||||
}
|
||||
|
@ -172,11 +172,11 @@
|
||||
NSPoint mouseLocation = [sender draggingLocation];
|
||||
NSPasteboard *draggingPBoard = [sender draggingPasteboard];
|
||||
|
||||
if ([[draggingPBoard types] containsObject:NSTIFFPboardType])
|
||||
if ([[draggingPBoard types] containsObject:NSPasteboardTypeTIFF])
|
||||
m_draggedObjectType = GHOST_kDragnDropTypeBitmap;
|
||||
else if ([[draggingPBoard types] containsObject:NSFilenamesPboardType])
|
||||
m_draggedObjectType = GHOST_kDragnDropTypeFilenames;
|
||||
else if ([[draggingPBoard types] containsObject:NSStringPboardType])
|
||||
else if ([[draggingPBoard types] containsObject:NSPasteboardTypeString])
|
||||
m_draggedObjectType = GHOST_kDragnDropTypeString;
|
||||
else
|
||||
return NSDragOperationNone;
|
||||
@ -235,7 +235,7 @@
|
||||
case GHOST_kDragnDropTypeBitmap:
|
||||
if ([NSImage canInitWithPasteboard:draggingPBoard]) {
|
||||
droppedImg = [[NSImage alloc] initWithPasteboard:draggingPBoard];
|
||||
data = droppedImg; //[draggingPBoard dataForType:NSTIFFPboardType];
|
||||
data = droppedImg; //[draggingPBoard dataForType:NSPasteboardTypeTIFF];
|
||||
}
|
||||
else
|
||||
return NO;
|
||||
@ -244,7 +244,7 @@
|
||||
data = [draggingPBoard propertyListForType:NSFilenamesPboardType];
|
||||
break;
|
||||
case GHOST_kDragnDropTypeString:
|
||||
data = [draggingPBoard stringForType:NSStringPboardType];
|
||||
data = [draggingPBoard stringForType:NSPasteboardTypeString];
|
||||
break;
|
||||
default:
|
||||
return NO;
|
||||
@ -388,8 +388,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa,
|
||||
[contentview setAllowedTouchTypes:(NSTouchTypeMaskDirect | NSTouchTypeMaskIndirect)];
|
||||
|
||||
[m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
|
||||
NSStringPboardType,
|
||||
NSTIFFPboardType,
|
||||
NSPasteboardTypeString,
|
||||
NSPasteboardTypeTIFF,
|
||||
nil]];
|
||||
|
||||
if (is_dialog && parentWindow) {
|
||||
|
Loading…
Reference in New Issue
Block a user