[macOS] NSCollectionView.ValidateDrop should use 'ref', not 'out'. Fi…

…xes #60416 (#2947)
xamarin · Nov 10, 2017 · 09b994a · 09b994a
1 parent 5993a81
commit 09b994a
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 1 deletion.
diff --git a/src/AppKit/NSCollectionViewDelegate.cs b/src/AppKit/NSCollectionViewDelegate.cs
@@ -0,0 +1,44 @@
+#if !XAMCORE_4_0
+using System;
+using XamCore.Foundation;
+using XamCore.ObjCRuntime;
+
+namespace XamCore.AppKit
+{
+	public partial class NSCollectionViewDelegate
+	{
+		[Obsolete ("Use 'ValidateDropOperation (NSCollectionView collectionView, NSDraggingInfo draggingInfo, ref NSIndexPath proposedDropIndexPath, ref NSCollectionViewDropOperation proposedDropOperation)' instead.")]
+		[Mac (10, 11)]
+		public virtual NSDragOperation ValidateDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, out NSIndexPath proposedDropIndexPath, out NSCollectionViewDropOperation proposedDropOperation)
+		{
+			proposedDropIndexPath = null;
+			proposedDropOperation = NSCollectionViewDropOperation.On;
+			return ValidateDropOperation (collectionView, draggingInfo, ref proposedDropIndexPath, ref proposedDropOperation);
+		}
+	}
+
+	public partial class NSCollectionViewDelegateFlowLayout
+	{
+		[Obsolete ("Use 'ValidateDropOperation (NSCollectionView collectionView, NSDraggingInfo draggingInfo, ref NSIndexPath proposedDropIndexPath, ref NSCollectionViewDropOperation proposedDropOperation)' instead.")]
+		[Mac (10, 11)]
+		public virtual NSDragOperation ValidateDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, out NSIndexPath proposedDropIndexPath, out NSCollectionViewDropOperation proposedDropOperation)
+		{
+			proposedDropIndexPath = null;
+			proposedDropOperation = NSCollectionViewDropOperation.On;
+			return ValidateDropOperation (collectionView, draggingInfo, ref proposedDropIndexPath, ref proposedDropOperation);
+		}
+	}
+
+	public static partial class NSCollectionViewDelegate_Extensions
+	{
+		[Obsolete ("Use 'ValidateDropOperation (NSCollectionView collectionView, NSDraggingInfo draggingInfo, ref NSIndexPath proposedDropIndexPath, ref NSCollectionViewDropOperation proposedDropOperation)' instead.")]
+		[Mac (10, 11)]
+		public static NSDragOperation ValidateDrop (this INSCollectionViewDelegate This, NSCollectionView collectionView, NSDraggingInfo draggingInfo, out NSIndexPath proposedDropIndexPath, out NSCollectionViewDropOperation proposedDropOperation)
+		{
+			proposedDropIndexPath = null;
+			proposedDropOperation = NSCollectionViewDropOperation.On;
+			return This.ValidateDropOperation (collectionView, draggingInfo, ref proposedDropIndexPath, ref proposedDropOperation);
+		}
+	}
+}
+#endif
diff --git a/src/appkit.cs b/src/appkit.cs
@@ -3008,9 +3008,15 @@ partial interface NSCollectionViewDelegate {
 		[Export ("collectionView:draggingImageForItemsAtIndexPaths:withEvent:offset:")]
 		NSImage GetDraggingImage (NSCollectionView collectionView, NSSet indexPaths, NSEvent theEvent, ref CGPoint dragImageOffset);
 
+#if !XAMCORE_4_0
 		[Mac (10,11)]
 		[Export ("collectionView:validateDrop:proposedIndexPath:dropOperation:")]
-		NSDragOperation ValidateDrop (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo, out NSIndexPath proposedDropIndexPath, out NSCollectionViewDropOperation proposedDropOperation);
+		NSDragOperation ValidateDropOperation (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo, ref NSIndexPath proposedDropIndexPath, ref NSCollectionViewDropOperation proposedDropOperation);
+#else
+		[Mac (10,11)]
+		[Export ("collectionView:validateDrop:proposedIndexPath:dropOperation:")]
+		NSDragOperation ValidateDrop (NSCollectionView collectionView, INSDraggingInfo draggingInfo, ref NSIndexPath proposedDropIndexPath, ref NSCollectionViewDropOperation proposedDropOperation);
+#endif
 
 		[Mac (10,11)]
 		[Export ("collectionView:acceptDrop:indexPath:dropOperation:")]

diff --git a/src/frameworks.sources b/src/frameworks.sources
@@ -145,6 +145,7 @@ APPKIT_SOURCES = \
 	AppKit/NSSavePanel.cs \
 	AppKit/NSWorkspace.cs \
 	AppKit/NSCollectionView.cs \
+	AppKit/NSCollectionViewDelegate.cs \
 	AppKit/NSTextTableBlock.cs \
 	AppKit/NSMutableFontCollection.cs \
 	AppKit/NSCollectionViewLayout.cs \