Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[appkit] Make NSCell and NSControl 'Formatter' accept null #6042

Merged
merged 2 commits into from May 14, 2019

Conversation

VincentDondain
Copy link
Contributor

@VincentDondain VincentDondain commented May 10, 2019

- Fixes xamarin#6032: NSTextField.Formatter missing null-allowed
  (xamarin#6032)
@monojenkins
Copy link
Collaborator

Build success
Build succeeded
API Diff (from stable)
API Diff (from PR only) (no change)
ℹ️ Generator Diff (please review changes)
Test run succeeded

@@ -4795,7 +4795,7 @@ partial interface NSControl {
[Export ("font")]
NSFont Font { get; set; }

[Export ("formatter", ArgumentSemantic.Retain)]
[Export ("formatter", ArgumentSemantic.Retain), NullAllowed]
NSObject Formatter { get; set; }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the latest doc (did not check headers) it's an NSFormatter or a subclass (__kindof) so, to avoid forgetting it, maybe

#if XAMCORE_4_0
NSFormatter Formatter { get; set; }
#else
NSObject Formatter { get; set; }
#endif

@monojenkins
Copy link
Collaborator

Build failure
Build succeeded
API Diff (from stable)
API Diff (from PR only) (no change)
ℹ️ Generator Diff (please review changes)
🔥 Test run failed 🔥

Test results

1 tests failed, 0 tests skipped, 98 tests passed.

Failed tests

  • monotouch-test/iOS Unified 64-bits - simulator/Debug (LinkSdk): Failed

@VincentDondain
Copy link
Contributor Author

@VincentDondain VincentDondain merged commit a48669e into xamarin:master May 14, 2019
@VincentDondain VincentDondain deleted the fix-6032 branch May 14, 2019 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NSTextField.Formatter missing null-allowed
5 participants