[AppKit] Remove a few obsolete members in .NET (#14043)

xamarin · Feb 4, 2022 · d766fe8 · d766fe8 · vs-mobiletools-engineering-service2 · Feb 4, 2022
1 parent 3a2acf9
commit d766fe8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/src/appkit.cs b/src/appkit.cs
@@ -8213,7 +8213,7 @@ interface NSGestureRecognizerDelegate {
 		[Export ("gestureRecognizer:shouldBeRequiredToFailByGestureRecognizer:"), DelegateName ("NSGesturesProbe"), DefaultValue (false)]
 		bool ShouldBeRequiredToFail (NSGestureRecognizer gestureRecognizer, NSGestureRecognizer otherGestureRecognizer);
 
-#if !XAMCORE_4_0
+#if !NET
 		[Export ("xamarinselector:removed:"), DelegateName ("NSGestureEvent"), DefaultValue (true)]
 		[Obsolete ("It will never be called.")]
 		bool ShouldReceiveEvent (NSGestureRecognizer gestureRecognizer, NSEvent gestureEvent);
@@ -11471,15 +11471,12 @@ interface NSPasteboardReading {
 		[Export ("readingOptionsForType:pasteboard:")]
 		NSPasteboardReadingOptions GetReadingOptionsForType (string type, NSPasteboard pasteboard);
 
-#if !XAMCORE_4_0
+#if !NET
 		// This binding is just broken, it's an ObjC ctor (init*) bound as a normal method.
 		[Abstract]
 		[Export ("xamarinselector:removed:")]
 		[Obsolete ("It will never be called.")]
 		NSObject InitWithPasteboardPropertyList (NSObject propertyList, string type);
-#else
-#error		FIXME: (compiler error to not forget)
-#error		FIXME: figure out how to bind constructors in protocols.
 #endif
 	}
 

diff --git a/tests/introspection/Mac/MacApiSelectorTest.cs b/tests/introspection/Mac/MacApiSelectorTest.cs
@@ -145,7 +145,7 @@ protected override bool Skip (Type type, string selectorName)
 				// The header declares this on an NSObject category but 
 				// it doesn't even respondsToSelector on NSView/NSCell...
 				return true;
-#if !XAMCORE_4_0
+#if !NET
 			case "xamarinselector:removed:":
 				return true;
 #endif

diff --git a/tests/monotouch-test/AppKit/NSPasteboard.cs b/tests/monotouch-test/AppKit/NSPasteboard.cs
@@ -35,14 +35,12 @@ class MyPasteboard2 : NSObject, INSPasteboardReading
 		class MyPasteboard2 : NSPasteboardReading
 #endif
 		{
-#if NET
-			NSObject INSPasteboardReading.InitWithPasteboardPropertyList (NSObject propertyList, string type)
-#else
+#if !NET
 			public override NSObject InitWithPasteboardPropertyList (NSObject propertyList, string type)
-#endif
 			{
 				return new NSObject ();
 			}
+#endif
 		}
 
 #if NET

diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore
@@ -61,8 +61,6 @@
 
 ## unsorted
 
-!extra-protocol-member! unexpected selector NSGestureRecognizerDelegate::xamarinselector:removed: found
-!extra-protocol-member! unexpected selector NSPasteboardReading::xamarinselector:removed: found
 !missing-enum! NSWritingDirectionFormatType not bound
 !missing-field! NSAuthorDocumentAttribute not bound
 !missing-field! NSBackgroundColorDocumentAttribute not bound