Changeset 14558
- Timestamp:
- 12/22/2005 02:11:43 AM (3 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Frameworks/Adium Framework/AIMessageEntryTextView.m
r14162 r14558 721 721 */ 722 722 723 #define SUPPORTED_DRAG_TYPE_ARRAY [NSArray arrayWithObjects: \ 724 NSFilenamesPboardType, NSTIFFPboardType, NSPDFPboardType, NSPICTPboardType, nil] 725 726 #define PASS_TO_SUPERCLASS_DRAG_TYPE_ARRAY [NSArray arrayWithObject:NSStringPboardType] 727 723 728 //We don't need to prepare for the types we are handling in performDragOperation: below 724 729 - (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender 725 730 { 726 731 NSPasteboard *pasteboard = [sender draggingPasteboard]; 727 NSString *type = [pasteboard availableTypeFromArray:[NSArray arrayWithObjects:NSFilenamesPboardType,NSTIFFPboardType,NSPDFPboardType,NSPICTPboardType,nil]]; 732 NSString *type = [pasteboard availableTypeFromArray:SUPPORTED_DRAG_TYPE_ARRAY]; 733 NSString *superclassType = [pasteboard availableTypeFromArray:PASS_TO_SUPERCLASS_DRAG_TYPE_ARRAY]; 728 734 BOOL allowDragOperation; 729 730 if (type) { 731 735 736 if (type && !superclassType) { 732 737 // XXX - This shouldn't let you insert into a view for which the delegate says NO to some sort of check. 733 738 allowDragOperation = YES; … … 743 748 { 744 749 NSPasteboard *pasteboard = [sender draggingPasteboard]; 745 NSString *type = [pasteboard availableTypeFromArray:[NSArray arrayWithObjects:NSFilenamesPboardType,NSTIFFPboardType,NSPDFPboardType,NSPICTPboardType,nil]]; 746 747 if (!type) { 750 NSString *type = [pasteboard availableTypeFromArray:SUPPORTED_DRAG_TYPE_ARRAY]; 751 NSString *superclassType = [pasteboard availableTypeFromArray:PASS_TO_SUPERCLASS_DRAG_TYPE_ARRAY]; 752 753 if (!type || superclassType) { 748 754 [super concludeDragOperation:sender]; 749 755 } … … 754 760 { 755 761 NSPasteboard *pasteboard = [sender draggingPasteboard]; 756 NSString *type = [pasteboard availableTypeFromArray:[NSArray arrayWithObjects:NSFilenamesPboardType,NSTIFFPboardType,NSPDFPboardType,NSPICTPboardType,nil]]; 757 762 NSString *type = [pasteboard availableTypeFromArray:SUPPORTED_DRAG_TYPE_ARRAY]; 763 NSString *superclassType = [pasteboard availableTypeFromArray:PASS_TO_SUPERCLASS_DRAG_TYPE_ARRAY]; 764 758 765 BOOL success = NO; 759 if (type ) {766 if (type && !superclassType) { 760 767 NSAttributedString *attachString; 761 768 NSImage *img = [[[NSImage alloc] initWithPasteboard:pasteboard] autorelease];