diff options
| author | Eric Maupin <ermaup@microsoft.com> | 2019-10-09 20:12:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 20:12:05 +0300 |
| commit | dcfd87fca6729a4170b9963d9fd0e900db59167a (patch) | |
| tree | 1da88c7a794edbcb757c9cf340b6148205603cd9 | |
| parent | d0d8e25d056386c0897457bb0c1cf1f84c3fb731 (diff) | |
| parent | cc5f000abfeb405191849a51250853d1ba3d137e (diff) | |
Merge pull request #636 from xamarin/dominique-FixCompilerWarning
[Mac] Use Override on ValidateProposedFirstResponder rather than Export.
| -rw-r--r-- | Xamarin.PropertyEditing.Mac/Controls/GroupEditorControl.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Xamarin.PropertyEditing.Mac/Controls/GroupEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/GroupEditorControl.cs index c528866..fc15eb6 100644 --- a/Xamarin.PropertyEditing.Mac/Controls/GroupEditorControl.cs +++ b/Xamarin.PropertyEditing.Mac/Controls/GroupEditorControl.cs @@ -128,21 +128,12 @@ namespace Xamarin.PropertyEditing.Mac FocusRingType = NSFocusRingType.None; } - // ValidateProposedFirstResponder is implemented as an extension method so we have to override the hard way (see xamarin-macios/4837) - [DllImport ("/usr/lib/libobjc.dylib", EntryPoint = "objc_msgSendSuper")] - public extern static bool bool_objc_msgSendSuper_IntPtr_IntPtr (IntPtr receiver, IntPtr selector, IntPtr arg1, IntPtr arg2); - - static readonly IntPtr selValidateProposedFirstResponder_ForEvent_Handle = ObjCRuntime.Selector.GetHandle ("validateProposedFirstResponder:forEvent:"); - - - [Export ("validateProposedFirstResponder:forEvent:")] - public bool ValidateProposedFirstResponder (NSResponder responder, NSEvent forEvent) + public override bool ValidateProposedFirstResponder (NSResponder responder, NSEvent forEvent) { if (responder is PropertyButton) return true; - bool baseRet = bool_objc_msgSendSuper_IntPtr_IntPtr (this.SuperHandle, selValidateProposedFirstResponder_ForEvent_Handle, responder.Handle, forEvent == null ? IntPtr.Zero : forEvent.Handle); - return true; + return base.ValidateProposedFirstResponder (responder, forEvent); } } |