From a75c0b9ff7f92281168185ebe2042cb38d28f3a2 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 10 Oct 2018 16:59:22 +0200 Subject: [PATCH] [AppKit] Fix issue 4837 by moving the category to be inline. Fixes #4837 (#4875) * [AppKit] Fix issue 4837 by moving the category to be inline. Fixes #4837 The NSControlEditingSupport needs to be inline to make the use of the API simpler allowing users to inherit an override the method. Fixes https://github.com/xamarin/xamarin-macios/issues/4837 --- src/appkit.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/appkit.cs b/src/appkit.cs index 4fca79ec1c..57ebff6752 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -22678,11 +22678,13 @@ namespace AppKit { NSPrintRenderingQuality PreferredRenderingQuality { get; } } +#if !XAMCORE_4_0 [Category, BaseType (typeof (NSResponder))] - partial interface NSControlEditingSupport { - [Mac (10, 7), Export ("validateProposedFirstResponder:forEvent:")] - bool ValidateProposedFirstResponder (NSResponder responder, [NullAllowed] NSEvent forEvent); - } + partial interface NSControlEditingSupport { + [Mac (10, 7), Export ("validateProposedFirstResponder:forEvent:")] + bool ValidateProposedFirstResponder (NSResponder responder, [NullAllowed] NSEvent forEvent); + } +#endif partial interface NSResponder { [Mac (10, 7), Export ("wantsScrollEventsForSwipeTrackingOnAxis:")] @@ -22696,6 +22698,10 @@ namespace AppKit { [Mac (10, 8), Export ("quickLookWithEvent:")] void QuickLook (NSEvent withEvent); + + // From NSControlEditingSupport category. Needs to be here to make the API easier to be used. issue 4837 + [Mac (10, 7), Export ("validateProposedFirstResponder:forEvent:")] + bool ValidateProposedFirstResponder (NSResponder responder, [NullAllowed] NSEvent forEvent); } [Category, BaseType (typeof (NSResponder))]