From 6375185967d3a64ffbe7469ca84dfe37835e3a12 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Tue, 9 Aug 2022 08:05:53 -0500 Subject: [PATCH 1/8] [AppKit] Xcode 14 Beta 1-5 --- src/AppKit/Enums.cs | 24 +- src/appkit.cs | 273 +++++++++++------- src/xkit.cs | 162 ++++++++++- .../MacCatalyst-UIKit.todo | 41 --- .../api-annotations-dotnet/iOS-UIKit.todo | 41 --- .../macOS-AppKit.ignore | 13 + .../api-annotations-dotnet/macOS-AppKit.todo | 75 +---- .../api-annotations-dotnet/tvOS-UIKit.todo | 41 --- tests/xtro-sharpie/iOS-UIKit.todo | 41 --- tests/xtro-sharpie/macOS-AppKit.ignore | 12 + tests/xtro-sharpie/macOS-AppKit.todo | 75 +---- tests/xtro-sharpie/tvOS-UIKit.todo | 41 --- 12 files changed, 373 insertions(+), 466 deletions(-) diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index 657a00359842..c93fcaa595e0 100644 --- a/src/AppKit/Enums.cs +++ b/src/AppKit/Enums.cs @@ -1637,13 +1637,6 @@ public enum NSTextTableLayoutAlgorithm : ulong { Automatic, Fixed } - [NoMacCatalyst] - [Flags] - [Native] - public enum NSTextListOptions : ulong { - PrependEnclosingMarker = 1 - } - [NoMacCatalyst] [Flags] public enum NSFontSymbolicTraits : int { // uint32_t NSFontSymbolicTraits @@ -3251,4 +3244,21 @@ public enum NSImageSymbolScale : long Medium = 2, Large = 3, } + + [NoMacCatalyst, Mac (13,0)] + [Native] + public enum NSColorWellStyle : long + { + Default = 0, + Minimal, + Expanded + } + + [NoMacCatalyst, Mac (13,0)] + [Native] + public enum NSComboButtonStyle : long + { + Split = 0, + Unified = 1 + } } diff --git a/src/appkit.cs b/src/appkit.cs index fbbd20bdff64..b52ed0f5ab8c 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -4827,6 +4827,24 @@ interface NSColorWell { [Export ("color", ArgumentSemantic.Copy)] NSColor Color { get; set; } + [Mac (13, 0)] + [Export ("colorWellStyle", ArgumentSemantic.Assign)] + NSColorWellStyle ColorWellStyle { get; set; } + + [Mac (13, 0)] + [Export ("image", ArgumentSemantic.Strong)] + [NullAllowed] + NSImage Image { get; set; } + + [Mac (13, 0)] + [Export ("pulldownTarget", ArgumentSemantic.Weak)] + [NullAllowed] + NSObject PulldownTarget { get; set; } + + [Mac (13, 0)] + [Export ("pulldownAction", ArgumentSemantic.Assign)] + [NullAllowed] + Selector PulldownAction { get; set; } } [NoMacCatalyst] @@ -6973,6 +6991,12 @@ partial interface NSFont : NSSecureCoding, NSCopying { [Mac (11,0)] [Export ("fontWithSize:")] NSFont GetFont (nfloat fontSize); + + [Advice ("Use constants from 'NSFontWeight' and 'NSFontWidth'.")] + [Mac (13,0)] + [Static] + [Export ("systemFontOfSize:weight:width:")] + NSFont SystemFontOfSize (nfloat fontSize, double weight, double width); } [NoMacCatalyst] @@ -7427,6 +7451,25 @@ interface NSFontWeight { nfloat Black { get; } } + [Mac (10, 10)] + [NoMacCatalyst] + [Static] + interface NSFontWidth + { + [Mac (13, 0)] + [Field ("NSFontWidthCompressed")] + nfloat Compressed { get; } + + [Field ("NSFontWidthCondensed")] + double Condensed { get; } + + [Field ("NSFontWidthStandard")] + double Standard { get; } + + [Field ("NSFontWidthExpanded")] + double Expanded { get; } + } + [Deprecated (PlatformName.MacOSX, 10, 10)] [NoMacCatalyst] [BaseType (typeof (NSMatrix))] @@ -9912,6 +9955,18 @@ partial interface NSImage : NSCopying, NSSecureCoding, NSPasteboardReading, NSPa [NoMacCatalyst] [Export ("symbolConfiguration", ArgumentSemantic.Copy)] NSImageSymbolConfiguration SymbolConfiguration { get; } + + [NoMacCatalyst, Mac (13,0)] + [Static] + [Export ("imageWithSymbolName:variableValue:")] + [return: NullAllowed] + NSImage ImageWithSymbolName (string name, double value); + + [NoMacCatalyst, Mac (13,0)] + [Static] + [Export ("imageWithSystemSymbolName:variableValue:accessibilityDescription:")] + [return: NullAllowed] + NSImage ImageWithSystemSymbolName (string name, double value, [NullAllowed] string description); } [MacCatalyst (13, 0)] @@ -18961,114 +19016,7 @@ partial interface NSTextInputContext { string LocalizedNameForInputSource (string inputSourceIdentifier); } - [NoMacCatalyst] - [BaseType (typeof (NSObject))] - interface NSTextList : NSCoding, NSCopying, NSSecureCoding { - [Export ("initWithMarkerFormat:options:")] -#if NET - NativeHandle Constructor ([BindAs (typeof (NSTextListMarkerFormats))] NSString format, NSTextListOptions mask); -#else - NativeHandle Constructor (string format, NSTextListOptions mask); -#endif - -#if !NET - [Wrap ("this (format.GetConstant(), mask)")] - NativeHandle Constructor (NSTextListMarkerFormats format, NSTextListOptions mask); -#endif - -#if NET - [BindAs (typeof (NSTextListMarkerFormats))] -#endif - [Export ("markerFormat")] -#if NET - NSString MarkerFormat { get; } -#else - string MarkerFormat { get; } -#endif - - [Export ("listOptions")] - NSTextListOptions ListOptions { get; } - - [Export ("markerForItemNumber:")] - string GetMarker (nint itemNum); - - //Detected properties - [Export ("startingItemNumber")] - nint StartingItemNumber { get; set; } - - } - - [NoMacCatalyst] - enum NSTextListMarkerFormats - { - [Mac (10, 13)] - [Field ("NSTextListMarkerBox")] - Box, - - [Mac (10, 13)] - [Field ("NSTextListMarkerCheck")] - Check, - - [Mac (10, 13)] - [Field ("NSTextListMarkerCircle")] - Circle, - - [Mac (10, 13)] - [Field ("NSTextListMarkerDiamond")] - Diamond, - - [Mac (10, 13)] - [Field ("NSTextListMarkerDisc")] - Disc, - - [Mac (10, 13)] - [Field ("NSTextListMarkerHyphen")] - Hyphen, - - [Mac (10, 13)] - [Field ("NSTextListMarkerSquare")] - Square, - - [Mac (10, 13)] - [Field ("NSTextListMarkerLowercaseHexadecimal")] - LowercaseHexadecimal, - - [Mac (10, 13)] - [Field ("NSTextListMarkerUppercaseHexadecimal")] - UppercaseHexadecimal, - - [Mac (10, 13)] - [Field ("NSTextListMarkerOctal")] - Octal, - - [Mac (10, 13)] - [Field ("NSTextListMarkerLowercaseAlpha")] - LowercaseAlpha, - - [Mac (10, 13)] - [Field ("NSTextListMarkerUppercaseAlpha")] - UppercaseAlpha, - [Mac (10, 13)] - [Field ("NSTextListMarkerLowercaseLatin")] - LowercaseLatin, - - [Mac (10, 13)] - [Field ("NSTextListMarkerUppercaseLatin")] - UppercaseLatin, - - [Mac (10, 13)] - [Field ("NSTextListMarkerLowercaseRoman")] - LowercaseRoman, - - [Mac (10, 13)] - [Field ("NSTextListMarkerUppercaseRoman")] - UppercaseRoman, - - [Mac (10, 13)] - [Field ("NSTextListMarkerDecimal")] - Decimal, - } [NoMacCatalyst] [BaseType (typeof (NSTextBlock))] @@ -20130,6 +20078,16 @@ partial interface NSToolbar { // [MacCatalyst (14,0)][NoMac] // [Field ("NSToolbarSupplementarySidebarTrackingSeparatorItemIdentifier")] // NSString SupplementarySidebarTrackingSeparatorItemIdentifier { get; } + + [Mac (13, 0), MacCatalyst (16, 0)] + [Export ("centeredItemIdentifiers", ArgumentSemantic.Copy)] + NSSet CenteredItemIdentifiers { get; set; } + + [NoMacCatalyst][Mac (13, 0)] + [Field ("NSToolbarItemKey")] + NSString NSToolbarItemKey { get; } + + } [MacCatalyst (13, 0)] @@ -20154,6 +20112,15 @@ interface NSToolbarDelegate { [Export ("toolbarDidRemoveItem:"), EventArgs ("NSNotification")] void DidRemoveItem (NSNotification notification); + + [Mac (13,0), MacCatalyst (16,0), DelegateName ("NSToolbarImmovableItemIdentifiers"), DefaultValue (null)] + [Export ("toolbarImmovableItemIdentifiers:")] + NSSet ToolbarImmovableItemIdentifiers (NSToolbar toolbar); + + [Mac (13,0), MacCatalyst (16,0)] + [Export ("toolbar:itemIdentifier:canBeInsertedAtIndex:"), DelegateName ("NSToolbarCanInsert"), DefaultValue (true)] + bool ItemCanBeInsertedAt (NSToolbar toolbar, string itemIdentifier, nint index); + } [NoMacCatalyst] @@ -20281,6 +20248,10 @@ interface NSToolbarItem : NSCopying, NSMenuItemValidation, NSValidatedUserInterf [Export ("itemMenuFormRepresentation", ArgumentSemantic.Copy)] [NullAllowed] UIMenuElement ItemMenuFormRepresentation { get; set; } + + [Mac (13, 0)][NoMacCatalyst] + [Export ("possibleLabels", ArgumentSemantic.Copy)] + NSSet PossibleLabels { get; set; } } [MacCatalyst (13,0)] @@ -22791,6 +22762,7 @@ interface NSSharingService [Export ("alternateImage", ArgumentSemantic.Strong)] NSImage AlternateImage { get; } + [Deprecated (PlatformName.MacOSX, 13, 0, message: "Use 'NSSharingServicePicker.StandardShareMenuItem' instead.")] [Export ("sharingServicesForItems:")][Static] NSSharingService [] SharingServicesForItems (NSObject [] items); @@ -22986,6 +22958,10 @@ interface NSSharingServicePicker [Export ("showRelativeToRect:ofView:preferredEdge:")] void ShowRelativeToRect (CGRect rect, NSView view, NSRectEdge preferredEdge); + + [Mac (13, 0)] + [Export ("standardShareMenuItem")] + NSMenuItem StandardShareMenuItem { get; } } interface INSSharingServicePickerDelegate {} @@ -28450,5 +28426,88 @@ interface NSImageSymbolConfiguration : NSCopying, NSSecureCoding [Mac (12,0)] [Export ("configurationByApplyingConfiguration:")] NSImageSymbolConfiguration Create (NSImageSymbolConfiguration configuration); + + [Mac (13,0)] + [Static] + [Export ("configurationPreferringMonochrome")] + NSImageSymbolConfiguration ConfigurationPreferringMonochrome (); + + [Mac (13,0)] + [Static] + [Export ("configurationPreferringHierarchical")] + NSImageSymbolConfiguration ConfigurationPreferringHierarchical (); + } + + [NoMacCatalyst, Mac (13,0)] + [BaseType (typeof(NSControl))] + interface NSComboButton + { + [DesignatedInitializer] + [Export ("initWithFrame:")] + NativeHandle Constructor (CGRect frameRect); + + [Static] + [Export ("comboButtonWithTitle:menu:target:action:")] + NSComboButton CreateWithTitle (string title, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + + [Static] + [Export ("comboButtonWithImage:menu:target:action:")] + NSComboButton CreateWithImage (NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + + [Static] + [Export ("comboButtonWithTitle:image:menu:target:action:")] + NSComboButton CreateWithTitle (string title, NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + + [Export ("title")] + string Title { get; set; } + + [NullAllowed, Export ("image", ArgumentSemantic.Strong)] + NSImage Image { get; set; } + + [Export ("imageScaling", ArgumentSemantic.Assign)] + NSImageScaling ImageScaling { get; set; } + + [Export ("menu", ArgumentSemantic.Strong)] + NSMenu Menu { get; set; } + + [Export ("style", ArgumentSemantic.Assign)] + NSComboButtonStyle Style { get; set; } } + + interface INSPreviewRepresentableActivityItem { } + + [NoMacCatalyst, Mac (13,0)] + [Protocol] + [BaseType (typeof(NSObject))] + interface NSPreviewRepresentableActivityItem + { + [Abstract] + [Export ("item", ArgumentSemantic.Strong)] + NSObject Item { get; } + + [NullAllowed, Export ("title")] + string Title { get; } + + [NullAllowed, Export ("imageProvider", ArgumentSemantic.Strong)] + NSItemProvider ImageProvider { get; } + + [NullAllowed, Export ("iconProvider", ArgumentSemantic.Strong)] + NSItemProvider IconProvider { get; } + } + + [NoMacCatalyst, Mac (13,0)] + [BaseType (typeof(NSObject))] + [DisableDefaultCtor] + interface NSPreviewRepresentingActivityItem : NSPreviewRepresentableActivityItem + { + [NoiOS] + [Export ("initWithItem:title:image:icon:")] + NativeHandle Constructor (NSObject item, [NullAllowed] string title, [NullAllowed] NSImage image, [NullAllowed] NSImage icon); + + [NoiOS] + [Export ("initWithItem:title:imageProvider:iconProvider:")] + [DesignatedInitializer] + NativeHandle Constructor (NSObject item, [NullAllowed] string title, [NullAllowed] NSItemProvider imageProvider, [NullAllowed] NSItemProvider iconProvider); + } + } diff --git a/src/xkit.cs b/src/xkit.cs index 856945eddd67..bae6f538e7d2 100644 --- a/src/xkit.cs +++ b/src/xkit.cs @@ -28,7 +28,6 @@ using NSRulerView=System.Object; using NSTextAttachmentCell=System.Object; using NSTextBlock=System.Object; -using NSTextList=System.Object; using NSTextTableBlock=System.Object; using NSTextTabType=System.Object; using NSTextStorageEditedFlags=System.Object; @@ -3416,6 +3415,18 @@ interface NSTextElement [NullAllowed, Export ("elementRange", ArgumentSemantic.Strong)] NSTextRange ElementRange { get; set; } + + [TV (16, 0), NoWatch, Mac (13, 0), iOS (16, 0)] + [Export ("childElements", ArgumentSemantic.Copy)] + NSTextElement[] ChildElements { get; } + + [TV (16, 0), NoWatch, Mac (13, 0), iOS (16, 0)] + [NullAllowed, Export ("parentElement", ArgumentSemantic.Weak)] + NSTextElement ParentElement { get; } + + [TV (16, 0), NoWatch, Mac (13, 0), iOS (16, 0)] + [Export ("isRepresentedElement")] + bool IsRepresentedElement { get; } } [TV (15,0), NoWatch, Mac (12,0), iOS (15,0), MacCatalyst (15,0)] @@ -3963,4 +3974,153 @@ interface NSTextContentStorage : NSTextStorageObserving NSTextRange GetAdjustedRange (NSTextRange textRange, bool forEditingTextSelection); } + [TV (9,0), NoWatch, Mac (10,0), iOS (7,0)] + [BaseType (typeof (NSObject))] + interface NSTextList : NSCoding, NSCopying, NSSecureCoding { + [Export ("initWithMarkerFormat:options:")] +#if NET + NativeHandle Constructor ([BindAs (typeof (NSTextListMarkerFormats))] NSString format, NSTextListOptions mask); +#else + NativeHandle Constructor (string format, NSTextListOptions mask); +#endif + +#if !NET + [Wrap ("this (format.GetConstant(), mask)")] + NativeHandle Constructor (NSTextListMarkerFormats format, NSTextListOptions mask); +#endif + +#if NET + [BindAs (typeof (NSTextListMarkerFormats))] +#endif + [Export ("markerFormat")] +#if NET + NSString MarkerFormat { get; } +#else + string MarkerFormat { get; } +#endif + + [Export ("listOptions")] + NSTextListOptions ListOptions { get; } + + [Export ("markerForItemNumber:")] + string GetMarker (nint itemNum); + + [Export ("startingItemNumber")] + nint StartingItemNumber { get; set; } + + [TV (16,0), NoWatch, Mac (13,0), iOS (16,0)] + [Export ("initWithMarkerFormat:options:startingItemNumber:")] + [DesignatedInitializer] + NativeHandle Constructor (string markerFormat, NSTextListOptions options, nint startingItemNumber); + + [TV (16, 0), NoWatch, Mac (13, 0), iOS (16, 0)] + [Export ("ordered")] + bool Ordered { [Bind ("isOrdered")] get; } + } + + [TV (16,0), NoWatch, Mac (13,0), iOS (16,0)] + [BaseType (typeof(NSTextParagraph))] + interface NSTextListElement + { + [Export ("initWithAttributedString:")] + [DesignatedInitializer] + NativeHandle Constructor ([NullAllowed] NSAttributedString attributedString); + + [Export ("initWithTextContentManager:")] + [DesignatedInitializer] + NativeHandle Constructor ([NullAllowed] NSTextContentManager textContentManager); + + [Export ("initWithParentElement:textList:contents:markerAttributes:childElements:")] + [DesignatedInitializer] + NativeHandle Constructor ([NullAllowed] NSTextListElement parent, NSTextList textList, [NullAllowed] NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, [NullAllowed] NSTextListElement[] children); + + [Static] + [Export ("textListElementWithContents:markerAttributes:textList:childElements:")] + NSTextListElement CreateWithContents (NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, NSTextList textList, [NullAllowed] NSTextListElement[] children); + + [Static] + [Export ("textListElementWithChildElements:textList:nestingLevel:")] + [return: NullAllowed] + NSTextListElement CreateWithChildElements (NSTextListElement[] children, NSTextList textList, nint nestingLevel); + + [Export ("textList", ArgumentSemantic.Strong)] + NSTextList TextList { get; } + + [NullAllowed, Export ("contents", ArgumentSemantic.Strong)] + NSAttributedString Contents { get; } + + [NullAllowed, Export ("markerAttributes", ArgumentSemantic.Strong)] + NSDictionary MarkerAttributes { get; } + + [Export ("attributedString", ArgumentSemantic.Strong)] + NSAttributedString AttributedString { get; } + + [Export ("childElements", ArgumentSemantic.Copy)] + NSTextListElement[] ChildElements { get; } + + [NullAllowed, Export ("parentElement", ArgumentSemantic.Weak)] + NSTextListElement ParentElement { get; } + } + + [Mac (10, 13)][MacCatalyst (13, 1)][NoWatch] + enum NSTextListMarkerFormats + { + [Field ("NSTextListMarkerBox")] + Box, + + [Field ("NSTextListMarkerCheck")] + Check, + + [Field ("NSTextListMarkerCircle")] + Circle, + + [Field ("NSTextListMarkerDiamond")] + Diamond, + + [Field ("NSTextListMarkerDisc")] + Disc, + + [Field ("NSTextListMarkerHyphen")] + Hyphen, + + [Field ("NSTextListMarkerSquare")] + Square, + + [Field ("NSTextListMarkerLowercaseHexadecimal")] + LowercaseHexadecimal, + + [Field ("NSTextListMarkerUppercaseHexadecimal")] + UppercaseHexadecimal, + + [Field ("NSTextListMarkerOctal")] + Octal, + + [Field ("NSTextListMarkerLowercaseAlpha")] + LowercaseAlpha, + + [Field ("NSTextListMarkerUppercaseAlpha")] + UppercaseAlpha, + + [Field ("NSTextListMarkerLowercaseLatin")] + LowercaseLatin, + + [Field ("NSTextListMarkerUppercaseLatin")] + UppercaseLatin, + + [Field ("NSTextListMarkerLowercaseRoman")] + LowercaseRoman, + + [Field ("NSTextListMarkerUppercaseRoman")] + UppercaseRoman, + + [Field ("NSTextListMarkerDecimal")] + Decimal, + } + + [TV (16,0), NoWatch, Mac (10,10), iOS (16,0)] + [Flags] + [Native] + public enum NSTextListOptions : ulong { + PrependEnclosingMarker = 1 + } } diff --git a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-UIKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-UIKit.todo index 36f052382ad6..6145aa29fd59 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-UIKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-UIKit.todo @@ -356,7 +356,6 @@ !missing-selector! UIToolbar::setTintColor: not bound !missing-selector! UIToolbar::tintColor not bound !extra-enum-value! Managed value 8 for UIModalPresentationStyle.BlurOverFullScreen is available for the current platform while the value in the native header is not -!missing-enum! NSTextListOptions not bound !missing-enum! UIAlertControllerSeverity not bound !missing-enum! UICalendarViewDecorationSize not bound !missing-enum! UICollectionViewSelfSizingInvalidation not bound @@ -383,23 +382,6 @@ !missing-enum-value! UISceneErrorCode native value UISceneErrorCodeGeometryRequestUnsupported = 100 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeInteractiveWithAccessory = 4 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeOnDragWithAccessory = 3 not bound -!missing-field! NSTextListMarkerBox not bound -!missing-field! NSTextListMarkerCheck not bound -!missing-field! NSTextListMarkerCircle not bound -!missing-field! NSTextListMarkerDecimal not bound -!missing-field! NSTextListMarkerDiamond not bound -!missing-field! NSTextListMarkerDisc not bound -!missing-field! NSTextListMarkerHyphen not bound -!missing-field! NSTextListMarkerLowercaseAlpha not bound -!missing-field! NSTextListMarkerLowercaseHexadecimal not bound -!missing-field! NSTextListMarkerLowercaseLatin not bound -!missing-field! NSTextListMarkerLowercaseRoman not bound -!missing-field! NSTextListMarkerOctal not bound -!missing-field! NSTextListMarkerSquare not bound -!missing-field! NSTextListMarkerUppercaseAlpha not bound -!missing-field! NSTextListMarkerUppercaseHexadecimal not bound -!missing-field! NSTextListMarkerUppercaseLatin not bound -!missing-field! NSTextListMarkerUppercaseRoman not bound !missing-field! UIActivityTypeCollaborationCopyLink not bound !missing-field! UIActivityTypeCollaborationInviteWithLink not bound !missing-field! UIMenuDocument not bound @@ -455,8 +437,6 @@ !missing-protocol-member! UITextViewDelegate::textView:editMenuForTextInRange:suggestedActions: not found !missing-selector! +NSCollectionLayoutGroup::horizontalGroupWithLayoutSize:repeatingSubitem:count: not bound !missing-selector! +NSCollectionLayoutGroup::verticalGroupWithLayoutSize:repeatingSubitem:count: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound !missing-selector! +UIBarButtonItemGroup::fixedGroupWithRepresentativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::movableGroupWithCustomizationIdentifier:representativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::optionalGroupWithCustomizationIdentifier:inDefaultCustomization:representativeItem:items: not bound @@ -484,25 +464,6 @@ !missing-selector! NSMutableParagraphStyle::setTextLists: not bound !missing-selector! NSMutableParagraphStyle::textLists not bound !missing-selector! NSParagraphStyle::textLists not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithCoder: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextList::listOptions not bound -!missing-selector! NSTextList::markerForItemNumber: not bound -!missing-selector! NSTextList::markerFormat not bound -!missing-selector! NSTextList::setStartingItemNumber: not bound -!missing-selector! NSTextList::startingItemNumber not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound !missing-selector! NSUIViewToolbarItem::initWithItemIdentifier:uiView: not bound !missing-selector! NSUIViewToolbarItem::setUIView: not bound !missing-selector! NSUIViewToolbarItem::uiView not bound @@ -726,8 +687,6 @@ !missing-selector! UIWindowSceneMacGeometryPreferences::initWithSystemFrame: not bound !missing-selector! UIWindowSceneMacGeometryPreferences::setSystemFrame: not bound !missing-selector! UIWindowSceneMacGeometryPreferences::systemFrame not bound -!missing-type! NSTextList not bound -!missing-type! NSTextListElement not bound !missing-type! NSUIViewToolbarItem not bound !missing-type! UICalendarSelection not bound !missing-type! UICalendarSelectionMultiDate not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo index de3eb8bda4e5..813539d41699 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/iOS-UIKit.todo @@ -29,7 +29,6 @@ !deprecated-attribute-missing! UIMenuItem missing a [Deprecated] attribute !deprecated-attribute-missing! UIPopoverPresentationController::barButtonItem missing a [Deprecated] attribute !deprecated-attribute-missing! UIPopoverPresentationController::setBarButtonItem: missing a [Deprecated] attribute -!missing-enum! NSTextListOptions not bound !missing-enum! UIAlertControllerSeverity not bound !missing-enum! UICalendarViewDecorationSize not bound !missing-enum! UICollectionViewSelfSizingInvalidation not bound @@ -55,23 +54,6 @@ !missing-enum-value! UISceneErrorCode native value UISceneErrorCodeGeometryRequestUnsupported = 100 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeInteractiveWithAccessory = 4 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeOnDragWithAccessory = 3 not bound -!missing-field! NSTextListMarkerBox not bound -!missing-field! NSTextListMarkerCheck not bound -!missing-field! NSTextListMarkerCircle not bound -!missing-field! NSTextListMarkerDecimal not bound -!missing-field! NSTextListMarkerDiamond not bound -!missing-field! NSTextListMarkerDisc not bound -!missing-field! NSTextListMarkerHyphen not bound -!missing-field! NSTextListMarkerLowercaseAlpha not bound -!missing-field! NSTextListMarkerLowercaseHexadecimal not bound -!missing-field! NSTextListMarkerLowercaseLatin not bound -!missing-field! NSTextListMarkerLowercaseRoman not bound -!missing-field! NSTextListMarkerOctal not bound -!missing-field! NSTextListMarkerSquare not bound -!missing-field! NSTextListMarkerUppercaseAlpha not bound -!missing-field! NSTextListMarkerUppercaseHexadecimal not bound -!missing-field! NSTextListMarkerUppercaseLatin not bound -!missing-field! NSTextListMarkerUppercaseRoman not bound !missing-field! UIActivityTypeCollaborationCopyLink not bound !missing-field! UIActivityTypeCollaborationInviteWithLink not bound !missing-field! UIMenuDocument not bound @@ -126,8 +108,6 @@ !missing-protocol-member! UITextViewDelegate::textView:editMenuForTextInRange:suggestedActions: not found !missing-selector! +NSCollectionLayoutGroup::horizontalGroupWithLayoutSize:repeatingSubitem:count: not bound !missing-selector! +NSCollectionLayoutGroup::verticalGroupWithLayoutSize:repeatingSubitem:count: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound !missing-selector! +UIBarButtonItemGroup::fixedGroupWithRepresentativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::movableGroupWithCustomizationIdentifier:representativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::optionalGroupWithCustomizationIdentifier:inDefaultCustomization:representativeItem:items: not bound @@ -155,25 +135,6 @@ !missing-selector! NSMutableParagraphStyle::setTextLists: not bound !missing-selector! NSMutableParagraphStyle::textLists not bound !missing-selector! NSParagraphStyle::textLists not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithCoder: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextList::listOptions not bound -!missing-selector! NSTextList::markerForItemNumber: not bound -!missing-selector! NSTextList::markerFormat not bound -!missing-selector! NSTextList::setStartingItemNumber: not bound -!missing-selector! NSTextList::startingItemNumber not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound !missing-selector! UIAlertController::setSeverity: not bound !missing-selector! UIAlertController::severity not bound !missing-selector! UIBarButtonItem::creatingFixedGroup not bound @@ -389,8 +350,6 @@ !missing-selector! UIWindowScene::isFullScreen not bound !missing-selector! UIWindowScene::requestGeometryUpdateWithPreferences:errorHandler: not bound !missing-selector! UIWindowScene::windowingBehaviors not bound -!missing-type! NSTextList not bound -!missing-type! NSTextListElement not bound !missing-type! UICalendarSelection not bound !missing-type! UICalendarSelectionMultiDate not bound !missing-type! UICalendarSelectionSingleDate not bound diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore index d2d69f38f8bd..ecf2d87ea101 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore +++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.ignore @@ -1197,3 +1197,16 @@ # bound as `const` not enums !extra-enum-value! Managed value 3 for NSBezelStyle.ThickSquare not found in native headers !extra-enum-value! Managed value 4 for NSBezelStyle.ThickerSquare not found in native headers + +# Will be deprecated in a future release +!deprecated-attribute-missing! NSColorWell::isBordered missing a [Deprecated] attribute +!deprecated-attribute-missing! NSColorWell::setBordered: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::lockFocus missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::lockFocusFlipped: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::unlockFocus missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::centeredItemIdentifier missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::setCenteredItemIdentifier: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::setSizeMode: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::sizeMode missing a [Deprecated] attribute +!deprecated-attribute-missing! NSWindow::setShowsToolbarButton: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSWindow::showsToolbarButton missing a [Deprecated] attribute \ No newline at end of file diff --git a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.todo index 689a53dc0726..d71eecd1310a 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/macOS-AppKit.todo @@ -1,48 +1,7 @@ -!deprecated-attribute-missing! NSColorWell::isBordered missing a [Deprecated] attribute -!deprecated-attribute-missing! NSColorWell::setBordered: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::lockFocus missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::lockFocusFlipped: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::unlockFocus missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::centeredItemIdentifier missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::setCenteredItemIdentifier: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::setSizeMode: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::sizeMode missing a [Deprecated] attribute -!deprecated-attribute-missing! NSWindow::setShowsToolbarButton: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSWindow::showsToolbarButton missing a [Deprecated] attribute -!missing-enum! NSColorWellStyle not bound -!missing-enum! NSComboButtonStyle not bound -!missing-field! NSToolbarItemKey not bound !missing-protocol! NSAccessibilityColor not bound -!missing-protocol! NSPreviewRepresentableActivityItem not bound !missing-protocol-conformance! NSColor should conform to NSAccessibilityColor (defined in 'NSAccessibilityColorConformance' category) -!missing-protocol-member! NSToolbarDelegate::toolbar:itemIdentifier:canBeInsertedAtIndex: not found -!missing-protocol-member! NSToolbarDelegate::toolbarImmovableItemIdentifiers: not found !missing-selector! +NSColorWell::colorWellWithStyle: not bound -!missing-selector! +NSComboButton::comboButtonWithImage:menu:target:action: not bound -!missing-selector! +NSComboButton::comboButtonWithTitle:image:menu:target:action: not bound -!missing-selector! +NSComboButton::comboButtonWithTitle:menu:target:action: not bound -!missing-selector! +NSImage::imageWithSymbolName:variableValue: not bound -!missing-selector! +NSImage::imageWithSystemSymbolName:variableValue:accessibilityDescription: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound -!missing-selector! NSColorWell::colorWellStyle not bound -!missing-selector! NSColorWell::image not bound -!missing-selector! NSColorWell::pulldownAction not bound -!missing-selector! NSColorWell::pulldownTarget not bound -!missing-selector! NSColorWell::setColorWellStyle: not bound -!missing-selector! NSColorWell::setImage: not bound -!missing-selector! NSColorWell::setPulldownAction: not bound -!missing-selector! NSColorWell::setPulldownTarget: not bound -!missing-selector! NSComboButton::image not bound -!missing-selector! NSComboButton::imageScaling not bound -!missing-selector! NSComboButton::menu not bound -!missing-selector! NSComboButton::setImage: not bound -!missing-selector! NSComboButton::setImageScaling: not bound -!missing-selector! NSComboButton::setMenu: not bound -!missing-selector! NSComboButton::setStyle: not bound -!missing-selector! NSComboButton::setTitle: not bound -!missing-selector! NSComboButton::style not bound -!missing-selector! NSComboButton::title not bound +!missing-selector! +NSImage::imageWithSymbolName:bundle:variableValue: not bound !missing-selector! NSNibConnector::destination not bound !missing-selector! NSNibConnector::establishConnection not bound !missing-selector! NSNibConnector::label not bound @@ -53,37 +12,7 @@ !missing-selector! NSNibConnector::source not bound !missing-selector! NSNibControlConnector::establishConnection not bound !missing-selector! NSNibOutletConnector::establishConnection not bound -!missing-selector! NSPreviewRepresentingActivityItem::initWithItem:title:image:icon: not bound -!missing-selector! NSPreviewRepresentingActivityItem::initWithItem:title:imageProvider:iconProvider: not bound -!missing-selector! NSSharingServicePicker::standardShareMenuItem not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound -!missing-selector! NSToolbar::centeredItemIdentifiers not bound -!missing-selector! NSToolbar::setCenteredItemIdentifiers: not bound !missing-selector! NSToolbarItem::isVisible not bound -!missing-selector! NSToolbarItem::possibleLabels not bound -!missing-selector! NSToolbarItem::setPossibleLabels: not bound -!missing-type! NSComboButton not bound !missing-type! NSNibConnector not bound !missing-type! NSNibControlConnector not bound -!missing-type! NSNibOutletConnector not bound -!missing-type! NSPreviewRepresentingActivityItem not bound -!missing-type! NSTextListElement not bound -!missing-field! NSFontWidthCompressed not bound -!missing-field! NSFontWidthCondensed not bound -!missing-field! NSFontWidthExpanded not bound -!missing-field! NSFontWidthStandard not bound -!missing-selector! +NSImageSymbolConfiguration::configurationPreferringHierarchical not bound -!missing-selector! +NSImageSymbolConfiguration::configurationPreferringMonochrome not bound -!missing-selector! +NSFont::systemFontOfSize:weight:width: not bound -!missing-selector! +NSImage::imageWithSymbolName:bundle:variableValue: not bound +!missing-type! NSNibOutletConnector not bound \ No newline at end of file diff --git a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-UIKit.todo b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-UIKit.todo index 57276d6e47e3..f262bbd2e0a3 100644 --- a/tests/xtro-sharpie/api-annotations-dotnet/tvOS-UIKit.todo +++ b/tests/xtro-sharpie/api-annotations-dotnet/tvOS-UIKit.todo @@ -56,7 +56,6 @@ !missing-enum-value! UICollectionLayoutListAppearance native value UICollectionLayoutListAppearanceSidebarPlain = 4 not bound !deprecated-attribute-missing! NSCollectionLayoutSection::setSupplementariesFollowContentInsets: missing a [Deprecated] attribute !deprecated-attribute-missing! NSCollectionLayoutSection::supplementariesFollowContentInsets missing a [Deprecated] attribute -!missing-enum! NSTextListOptions not bound !missing-enum! UIAlertControllerSeverity not bound !missing-enum! UICollectionViewSelfSizingInvalidation not bound !missing-enum! UIFindSessionSearchResultDisplayStyle not bound @@ -72,23 +71,6 @@ !missing-enum-value! UISceneErrorCode native value UISceneErrorCodeGeometryRequestUnsupported = 100 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeInteractiveWithAccessory = 4 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeOnDragWithAccessory = 3 not bound -!missing-field! NSTextListMarkerBox not bound -!missing-field! NSTextListMarkerCheck not bound -!missing-field! NSTextListMarkerCircle not bound -!missing-field! NSTextListMarkerDecimal not bound -!missing-field! NSTextListMarkerDiamond not bound -!missing-field! NSTextListMarkerDisc not bound -!missing-field! NSTextListMarkerHyphen not bound -!missing-field! NSTextListMarkerLowercaseAlpha not bound -!missing-field! NSTextListMarkerLowercaseHexadecimal not bound -!missing-field! NSTextListMarkerLowercaseLatin not bound -!missing-field! NSTextListMarkerLowercaseRoman not bound -!missing-field! NSTextListMarkerOctal not bound -!missing-field! NSTextListMarkerSquare not bound -!missing-field! NSTextListMarkerUppercaseAlpha not bound -!missing-field! NSTextListMarkerUppercaseHexadecimal not bound -!missing-field! NSTextListMarkerUppercaseLatin not bound -!missing-field! NSTextListMarkerUppercaseRoman not bound !missing-field! UIMenuDocument not bound !missing-field! UIScreenReferenceDisplayModeStatusDidChangeNotification not bound !missing-field! UIWindowSceneSessionRoleExternalDisplayNonInteractive not bound @@ -116,8 +98,6 @@ !missing-protocol-member! UITextViewDelegate::textView:editMenuForTextInRange:suggestedActions: not found !missing-selector! +NSCollectionLayoutGroup::horizontalGroupWithLayoutSize:repeatingSubitem:count: not bound !missing-selector! +NSCollectionLayoutGroup::verticalGroupWithLayoutSize:repeatingSubitem:count: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound !missing-selector! +UIFocusDebugger::focusGroupsForEnvironment: not bound !missing-selector! +UIFocusDebugger::preferredFocusEnvironmentsForEnvironment: not bound !missing-selector! +UIImage::imageNamed:inBundle:variableValue:withConfiguration: not bound @@ -130,25 +110,6 @@ !missing-selector! NSMutableParagraphStyle::setTextLists: not bound !missing-selector! NSMutableParagraphStyle::textLists not bound !missing-selector! NSParagraphStyle::textLists not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithCoder: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextList::listOptions not bound -!missing-selector! NSTextList::markerForItemNumber: not bound -!missing-selector! NSTextList::markerFormat not bound -!missing-selector! NSTextList::setStartingItemNumber: not bound -!missing-selector! NSTextList::startingItemNumber not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound !missing-selector! UIAlertController::setSeverity: not bound !missing-selector! UIAlertController::severity not bound !missing-selector! UICollectionView::selfSizingInvalidation not bound @@ -189,8 +150,6 @@ !missing-selector! UIWindowScene::isFullScreen not bound !missing-selector! UIWindowScene::requestGeometryUpdateWithPreferences:errorHandler: not bound !missing-selector! UIWindowScene::windowingBehaviors not bound -!missing-type! NSTextList not bound -!missing-type! NSTextListElement not bound !missing-type! UISceneWindowingBehaviors not bound !missing-type! UIWindowSceneGeometry not bound !missing-type! UIWindowSceneGeometryPreferences not bound diff --git a/tests/xtro-sharpie/iOS-UIKit.todo b/tests/xtro-sharpie/iOS-UIKit.todo index de3eb8bda4e5..813539d41699 100644 --- a/tests/xtro-sharpie/iOS-UIKit.todo +++ b/tests/xtro-sharpie/iOS-UIKit.todo @@ -29,7 +29,6 @@ !deprecated-attribute-missing! UIMenuItem missing a [Deprecated] attribute !deprecated-attribute-missing! UIPopoverPresentationController::barButtonItem missing a [Deprecated] attribute !deprecated-attribute-missing! UIPopoverPresentationController::setBarButtonItem: missing a [Deprecated] attribute -!missing-enum! NSTextListOptions not bound !missing-enum! UIAlertControllerSeverity not bound !missing-enum! UICalendarViewDecorationSize not bound !missing-enum! UICollectionViewSelfSizingInvalidation not bound @@ -55,23 +54,6 @@ !missing-enum-value! UISceneErrorCode native value UISceneErrorCodeGeometryRequestUnsupported = 100 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeInteractiveWithAccessory = 4 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeOnDragWithAccessory = 3 not bound -!missing-field! NSTextListMarkerBox not bound -!missing-field! NSTextListMarkerCheck not bound -!missing-field! NSTextListMarkerCircle not bound -!missing-field! NSTextListMarkerDecimal not bound -!missing-field! NSTextListMarkerDiamond not bound -!missing-field! NSTextListMarkerDisc not bound -!missing-field! NSTextListMarkerHyphen not bound -!missing-field! NSTextListMarkerLowercaseAlpha not bound -!missing-field! NSTextListMarkerLowercaseHexadecimal not bound -!missing-field! NSTextListMarkerLowercaseLatin not bound -!missing-field! NSTextListMarkerLowercaseRoman not bound -!missing-field! NSTextListMarkerOctal not bound -!missing-field! NSTextListMarkerSquare not bound -!missing-field! NSTextListMarkerUppercaseAlpha not bound -!missing-field! NSTextListMarkerUppercaseHexadecimal not bound -!missing-field! NSTextListMarkerUppercaseLatin not bound -!missing-field! NSTextListMarkerUppercaseRoman not bound !missing-field! UIActivityTypeCollaborationCopyLink not bound !missing-field! UIActivityTypeCollaborationInviteWithLink not bound !missing-field! UIMenuDocument not bound @@ -126,8 +108,6 @@ !missing-protocol-member! UITextViewDelegate::textView:editMenuForTextInRange:suggestedActions: not found !missing-selector! +NSCollectionLayoutGroup::horizontalGroupWithLayoutSize:repeatingSubitem:count: not bound !missing-selector! +NSCollectionLayoutGroup::verticalGroupWithLayoutSize:repeatingSubitem:count: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound !missing-selector! +UIBarButtonItemGroup::fixedGroupWithRepresentativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::movableGroupWithCustomizationIdentifier:representativeItem:items: not bound !missing-selector! +UIBarButtonItemGroup::optionalGroupWithCustomizationIdentifier:inDefaultCustomization:representativeItem:items: not bound @@ -155,25 +135,6 @@ !missing-selector! NSMutableParagraphStyle::setTextLists: not bound !missing-selector! NSMutableParagraphStyle::textLists not bound !missing-selector! NSParagraphStyle::textLists not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithCoder: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextList::listOptions not bound -!missing-selector! NSTextList::markerForItemNumber: not bound -!missing-selector! NSTextList::markerFormat not bound -!missing-selector! NSTextList::setStartingItemNumber: not bound -!missing-selector! NSTextList::startingItemNumber not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound !missing-selector! UIAlertController::setSeverity: not bound !missing-selector! UIAlertController::severity not bound !missing-selector! UIBarButtonItem::creatingFixedGroup not bound @@ -389,8 +350,6 @@ !missing-selector! UIWindowScene::isFullScreen not bound !missing-selector! UIWindowScene::requestGeometryUpdateWithPreferences:errorHandler: not bound !missing-selector! UIWindowScene::windowingBehaviors not bound -!missing-type! NSTextList not bound -!missing-type! NSTextListElement not bound !missing-type! UICalendarSelection not bound !missing-type! UICalendarSelectionMultiDate not bound !missing-type! UICalendarSelectionSingleDate not bound diff --git a/tests/xtro-sharpie/macOS-AppKit.ignore b/tests/xtro-sharpie/macOS-AppKit.ignore index 09da11202c11..21cf0b609b2b 100644 --- a/tests/xtro-sharpie/macOS-AppKit.ignore +++ b/tests/xtro-sharpie/macOS-AppKit.ignore @@ -1318,3 +1318,15 @@ # deprecated !extra-enum-value! Managed value 2048 for NSWindowStyle.Unscaled not found in native headers +# Will be deprecated in a future release +!deprecated-attribute-missing! NSColorWell::isBordered missing a [Deprecated] attribute +!deprecated-attribute-missing! NSColorWell::setBordered: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::lockFocus missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::lockFocusFlipped: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSImage::unlockFocus missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::centeredItemIdentifier missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::setCenteredItemIdentifier: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::setSizeMode: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSToolbar::sizeMode missing a [Deprecated] attribute +!deprecated-attribute-missing! NSWindow::setShowsToolbarButton: missing a [Deprecated] attribute +!deprecated-attribute-missing! NSWindow::showsToolbarButton missing a [Deprecated] attribute \ No newline at end of file diff --git a/tests/xtro-sharpie/macOS-AppKit.todo b/tests/xtro-sharpie/macOS-AppKit.todo index 689a53dc0726..d71eecd1310a 100644 --- a/tests/xtro-sharpie/macOS-AppKit.todo +++ b/tests/xtro-sharpie/macOS-AppKit.todo @@ -1,48 +1,7 @@ -!deprecated-attribute-missing! NSColorWell::isBordered missing a [Deprecated] attribute -!deprecated-attribute-missing! NSColorWell::setBordered: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::lockFocus missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::lockFocusFlipped: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSImage::unlockFocus missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::centeredItemIdentifier missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::setCenteredItemIdentifier: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::setSizeMode: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSToolbar::sizeMode missing a [Deprecated] attribute -!deprecated-attribute-missing! NSWindow::setShowsToolbarButton: missing a [Deprecated] attribute -!deprecated-attribute-missing! NSWindow::showsToolbarButton missing a [Deprecated] attribute -!missing-enum! NSColorWellStyle not bound -!missing-enum! NSComboButtonStyle not bound -!missing-field! NSToolbarItemKey not bound !missing-protocol! NSAccessibilityColor not bound -!missing-protocol! NSPreviewRepresentableActivityItem not bound !missing-protocol-conformance! NSColor should conform to NSAccessibilityColor (defined in 'NSAccessibilityColorConformance' category) -!missing-protocol-member! NSToolbarDelegate::toolbar:itemIdentifier:canBeInsertedAtIndex: not found -!missing-protocol-member! NSToolbarDelegate::toolbarImmovableItemIdentifiers: not found !missing-selector! +NSColorWell::colorWellWithStyle: not bound -!missing-selector! +NSComboButton::comboButtonWithImage:menu:target:action: not bound -!missing-selector! +NSComboButton::comboButtonWithTitle:image:menu:target:action: not bound -!missing-selector! +NSComboButton::comboButtonWithTitle:menu:target:action: not bound -!missing-selector! +NSImage::imageWithSymbolName:variableValue: not bound -!missing-selector! +NSImage::imageWithSystemSymbolName:variableValue:accessibilityDescription: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound -!missing-selector! NSColorWell::colorWellStyle not bound -!missing-selector! NSColorWell::image not bound -!missing-selector! NSColorWell::pulldownAction not bound -!missing-selector! NSColorWell::pulldownTarget not bound -!missing-selector! NSColorWell::setColorWellStyle: not bound -!missing-selector! NSColorWell::setImage: not bound -!missing-selector! NSColorWell::setPulldownAction: not bound -!missing-selector! NSColorWell::setPulldownTarget: not bound -!missing-selector! NSComboButton::image not bound -!missing-selector! NSComboButton::imageScaling not bound -!missing-selector! NSComboButton::menu not bound -!missing-selector! NSComboButton::setImage: not bound -!missing-selector! NSComboButton::setImageScaling: not bound -!missing-selector! NSComboButton::setMenu: not bound -!missing-selector! NSComboButton::setStyle: not bound -!missing-selector! NSComboButton::setTitle: not bound -!missing-selector! NSComboButton::style not bound -!missing-selector! NSComboButton::title not bound +!missing-selector! +NSImage::imageWithSymbolName:bundle:variableValue: not bound !missing-selector! NSNibConnector::destination not bound !missing-selector! NSNibConnector::establishConnection not bound !missing-selector! NSNibConnector::label not bound @@ -53,37 +12,7 @@ !missing-selector! NSNibConnector::source not bound !missing-selector! NSNibControlConnector::establishConnection not bound !missing-selector! NSNibOutletConnector::establishConnection not bound -!missing-selector! NSPreviewRepresentingActivityItem::initWithItem:title:image:icon: not bound -!missing-selector! NSPreviewRepresentingActivityItem::initWithItem:title:imageProvider:iconProvider: not bound -!missing-selector! NSSharingServicePicker::standardShareMenuItem not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound -!missing-selector! NSToolbar::centeredItemIdentifiers not bound -!missing-selector! NSToolbar::setCenteredItemIdentifiers: not bound !missing-selector! NSToolbarItem::isVisible not bound -!missing-selector! NSToolbarItem::possibleLabels not bound -!missing-selector! NSToolbarItem::setPossibleLabels: not bound -!missing-type! NSComboButton not bound !missing-type! NSNibConnector not bound !missing-type! NSNibControlConnector not bound -!missing-type! NSNibOutletConnector not bound -!missing-type! NSPreviewRepresentingActivityItem not bound -!missing-type! NSTextListElement not bound -!missing-field! NSFontWidthCompressed not bound -!missing-field! NSFontWidthCondensed not bound -!missing-field! NSFontWidthExpanded not bound -!missing-field! NSFontWidthStandard not bound -!missing-selector! +NSImageSymbolConfiguration::configurationPreferringHierarchical not bound -!missing-selector! +NSImageSymbolConfiguration::configurationPreferringMonochrome not bound -!missing-selector! +NSFont::systemFontOfSize:weight:width: not bound -!missing-selector! +NSImage::imageWithSymbolName:bundle:variableValue: not bound +!missing-type! NSNibOutletConnector not bound \ No newline at end of file diff --git a/tests/xtro-sharpie/tvOS-UIKit.todo b/tests/xtro-sharpie/tvOS-UIKit.todo index 47365ea8c338..1ce7f724417b 100644 --- a/tests/xtro-sharpie/tvOS-UIKit.todo +++ b/tests/xtro-sharpie/tvOS-UIKit.todo @@ -21,7 +21,6 @@ !extra-enum-value! Managed value 2 for UIActivityIndicatorViewStyle.Gray is available for the current platform while the value in the native header is not !deprecated-attribute-missing! NSCollectionLayoutSection::setSupplementariesFollowContentInsets: missing a [Deprecated] attribute !deprecated-attribute-missing! NSCollectionLayoutSection::supplementariesFollowContentInsets missing a [Deprecated] attribute -!missing-enum! NSTextListOptions not bound !missing-enum! UIAlertControllerSeverity not bound !missing-enum! UICollectionViewSelfSizingInvalidation not bound !missing-enum! UIFindSessionSearchResultDisplayStyle not bound @@ -37,23 +36,6 @@ !missing-enum-value! UISceneErrorCode native value UISceneErrorCodeGeometryRequestUnsupported = 100 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeInteractiveWithAccessory = 4 not bound !missing-enum-value! UIScrollViewKeyboardDismissMode native value UIScrollViewKeyboardDismissModeOnDragWithAccessory = 3 not bound -!missing-field! NSTextListMarkerBox not bound -!missing-field! NSTextListMarkerCheck not bound -!missing-field! NSTextListMarkerCircle not bound -!missing-field! NSTextListMarkerDecimal not bound -!missing-field! NSTextListMarkerDiamond not bound -!missing-field! NSTextListMarkerDisc not bound -!missing-field! NSTextListMarkerHyphen not bound -!missing-field! NSTextListMarkerLowercaseAlpha not bound -!missing-field! NSTextListMarkerLowercaseHexadecimal not bound -!missing-field! NSTextListMarkerLowercaseLatin not bound -!missing-field! NSTextListMarkerLowercaseRoman not bound -!missing-field! NSTextListMarkerOctal not bound -!missing-field! NSTextListMarkerSquare not bound -!missing-field! NSTextListMarkerUppercaseAlpha not bound -!missing-field! NSTextListMarkerUppercaseHexadecimal not bound -!missing-field! NSTextListMarkerUppercaseLatin not bound -!missing-field! NSTextListMarkerUppercaseRoman not bound !missing-field! UIMenuDocument not bound !missing-field! UIScreenReferenceDisplayModeStatusDidChangeNotification not bound !missing-field! UIWindowSceneSessionRoleExternalDisplayNonInteractive not bound @@ -81,8 +63,6 @@ !missing-protocol-member! UITextViewDelegate::textView:editMenuForTextInRange:suggestedActions: not found !missing-selector! +NSCollectionLayoutGroup::horizontalGroupWithLayoutSize:repeatingSubitem:count: not bound !missing-selector! +NSCollectionLayoutGroup::verticalGroupWithLayoutSize:repeatingSubitem:count: not bound -!missing-selector! +NSTextListElement::textListElementWithChildElements:textList:nestingLevel: not bound -!missing-selector! +NSTextListElement::textListElementWithContents:markerAttributes:textList:childElements: not bound !missing-selector! +UIFocusDebugger::focusGroupsForEnvironment: not bound !missing-selector! +UIFocusDebugger::preferredFocusEnvironmentsForEnvironment: not bound !missing-selector! +UIImage::imageNamed:inBundle:variableValue:withConfiguration: not bound @@ -95,25 +75,6 @@ !missing-selector! NSMutableParagraphStyle::setTextLists: not bound !missing-selector! NSMutableParagraphStyle::textLists not bound !missing-selector! NSParagraphStyle::textLists not bound -!missing-selector! NSTextElement::childElements not bound -!missing-selector! NSTextElement::isRepresentedElement not bound -!missing-selector! NSTextElement::parentElement not bound -!missing-selector! NSTextList::initWithCoder: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options: not bound -!missing-selector! NSTextList::initWithMarkerFormat:options:startingItemNumber: not bound -!missing-selector! NSTextList::isOrdered not bound -!missing-selector! NSTextList::listOptions not bound -!missing-selector! NSTextList::markerForItemNumber: not bound -!missing-selector! NSTextList::markerFormat not bound -!missing-selector! NSTextList::setStartingItemNumber: not bound -!missing-selector! NSTextList::startingItemNumber not bound -!missing-selector! NSTextListElement::attributedString not bound -!missing-selector! NSTextListElement::childElements not bound -!missing-selector! NSTextListElement::contents not bound -!missing-selector! NSTextListElement::initWithParentElement:textList:contents:markerAttributes:childElements: not bound -!missing-selector! NSTextListElement::markerAttributes not bound -!missing-selector! NSTextListElement::parentElement not bound -!missing-selector! NSTextListElement::textList not bound !missing-selector! UIAlertController::setSeverity: not bound !missing-selector! UIAlertController::severity not bound !missing-selector! UICollectionView::selfSizingInvalidation not bound @@ -154,8 +115,6 @@ !missing-selector! UIWindowScene::isFullScreen not bound !missing-selector! UIWindowScene::requestGeometryUpdateWithPreferences:errorHandler: not bound !missing-selector! UIWindowScene::windowingBehaviors not bound -!missing-type! NSTextList not bound -!missing-type! NSTextListElement not bound !missing-type! UISceneWindowingBehaviors not bound !missing-type! UIWindowSceneGeometry not bound !missing-type! UIWindowSceneGeometryPreferences not bound From 6e7db606063527ba7ec256f9c3d40a585570217d Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Fri, 26 Aug 2022 10:12:29 -0500 Subject: [PATCH 2/8] Apply suggestions from code review Co-authored-by: Alex Soto --- src/AppKit/Enums.cs | 2 +- src/appkit.cs | 21 ++++++++++----------- src/xkit.cs | 8 ++++---- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index c93fcaa595e0..955256007cc9 100644 --- a/src/AppKit/Enums.cs +++ b/src/AppKit/Enums.cs @@ -3259,6 +3259,6 @@ public enum NSColorWellStyle : long public enum NSComboButtonStyle : long { Split = 0, - Unified = 1 + Unified = 1, } } diff --git a/src/appkit.cs b/src/appkit.cs index b52ed0f5ab8c..a14d7984bfbd 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -6996,7 +6996,7 @@ partial interface NSFont : NSSecureCoding, NSCopying { [Mac (13,0)] [Static] [Export ("systemFontOfSize:weight:width:")] - NSFont SystemFontOfSize (nfloat fontSize, double weight, double width); + NSFont GetSystemFontOfSize (nfloat fontSize, double weight, double width); } [NoMacCatalyst] @@ -9960,13 +9960,13 @@ partial interface NSImage : NSCopying, NSSecureCoding, NSPasteboardReading, NSPa [Static] [Export ("imageWithSymbolName:variableValue:")] [return: NullAllowed] - NSImage ImageWithSymbolName (string name, double value); + NSImage GetImage (string symbolName, double variableValue); [NoMacCatalyst, Mac (13,0)] [Static] [Export ("imageWithSystemSymbolName:variableValue:accessibilityDescription:")] [return: NullAllowed] - NSImage ImageWithSystemSymbolName (string name, double value, [NullAllowed] string description); + NSImage GetImage (string systemSymbolName, double variableValue, [NullAllowed] string accessibilityDescription); } [MacCatalyst (13, 0)] @@ -20115,11 +20115,11 @@ interface NSToolbarDelegate { [Mac (13,0), MacCatalyst (16,0), DelegateName ("NSToolbarImmovableItemIdentifiers"), DefaultValue (null)] [Export ("toolbarImmovableItemIdentifiers:")] - NSSet ToolbarImmovableItemIdentifiers (NSToolbar toolbar); + NSSet GetToolbarImmovableItemIdentifiers (NSToolbar toolbar); [Mac (13,0), MacCatalyst (16,0)] [Export ("toolbar:itemIdentifier:canBeInsertedAtIndex:"), DelegateName ("NSToolbarCanInsert"), DefaultValue (true)] - bool ItemCanBeInsertedAt (NSToolbar toolbar, string itemIdentifier, nint index); + bool GetItemCanBeInsertedAt (NSToolbar toolbar, string itemIdentifier, nint index); } @@ -28430,12 +28430,12 @@ interface NSImageSymbolConfiguration : NSCopying, NSSecureCoding [Mac (13,0)] [Static] [Export ("configurationPreferringMonochrome")] - NSImageSymbolConfiguration ConfigurationPreferringMonochrome (); + NSImageSymbolConfiguration GetConfigurationPreferringMonochrome (); [Mac (13,0)] [Static] [Export ("configurationPreferringHierarchical")] - NSImageSymbolConfiguration ConfigurationPreferringHierarchical (); + NSImageSymbolConfiguration GetConfigurationPreferringHierarchical (); } [NoMacCatalyst, Mac (13,0)] @@ -28448,15 +28448,15 @@ interface NSComboButton [Static] [Export ("comboButtonWithTitle:menu:target:action:")] - NSComboButton CreateWithTitle (string title, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + NSComboButton Create (string title, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); [Static] [Export ("comboButtonWithImage:menu:target:action:")] - NSComboButton CreateWithImage (NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + NSComboButton Create (NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); [Static] [Export ("comboButtonWithTitle:image:menu:target:action:")] - NSComboButton CreateWithTitle (string title, NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); + NSComboButton Create (string title, NSImage image, [NullAllowed] NSMenu menu, [NullAllowed] NSObject target, [NullAllowed] Selector action); [Export ("title")] string Title { get; set; } @@ -28478,7 +28478,6 @@ interface INSPreviewRepresentableActivityItem { } [NoMacCatalyst, Mac (13,0)] [Protocol] - [BaseType (typeof(NSObject))] interface NSPreviewRepresentableActivityItem { [Abstract] diff --git a/src/xkit.cs b/src/xkit.cs index bae6f538e7d2..d66e33894d62 100644 --- a/src/xkit.cs +++ b/src/xkit.cs @@ -4032,16 +4032,16 @@ interface NSTextListElement [Export ("initWithParentElement:textList:contents:markerAttributes:childElements:")] [DesignatedInitializer] - NativeHandle Constructor ([NullAllowed] NSTextListElement parent, NSTextList textList, [NullAllowed] NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, [NullAllowed] NSTextListElement[] children); + NativeHandle Constructor ([NullAllowed] NSTextListElement parent, NSTextList textList, [NullAllowed] NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, [NullAllowed] NSTextListElement[] children); [Static] [Export ("textListElementWithContents:markerAttributes:textList:childElements:")] - NSTextListElement CreateWithContents (NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, NSTextList textList, [NullAllowed] NSTextListElement[] children); + NSTextListElement Create (NSAttributedString contents, [NullAllowed] NSDictionary markerAttributes, NSTextList textList, [NullAllowed] NSTextListElement[] children); [Static] [Export ("textListElementWithChildElements:textList:nestingLevel:")] [return: NullAllowed] - NSTextListElement CreateWithChildElements (NSTextListElement[] children, NSTextList textList, nint nestingLevel); + NSTextListElement Create (NSTextListElement[] children, NSTextList textList, nint nestingLevel); [Export ("textList", ArgumentSemantic.Strong)] NSTextList TextList { get; } @@ -4050,7 +4050,7 @@ interface NSTextListElement NSAttributedString Contents { get; } [NullAllowed, Export ("markerAttributes", ArgumentSemantic.Strong)] - NSDictionary MarkerAttributes { get; } + NSDictionary WeakMarkerAttributes { get; } [Export ("attributedString", ArgumentSemantic.Strong)] NSAttributedString AttributedString { get; } From 68ede50c72853b7c3f98af3caff5ebdf73137e8d Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Fri, 26 Aug 2022 10:17:53 -0500 Subject: [PATCH 3/8] Update src/AppKit/Enums.cs Co-authored-by: Alex Soto --- src/AppKit/Enums.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index 955256007cc9..f1643801319d 100644 --- a/src/AppKit/Enums.cs +++ b/src/AppKit/Enums.cs @@ -3251,7 +3251,7 @@ public enum NSColorWellStyle : long { Default = 0, Minimal, - Expanded + Expanded, } [NoMacCatalyst, Mac (13,0)] From c250cdaf641c118bb862cef25fcdc13935b4a314 Mon Sep 17 00:00:00 2001 From: Chris Hamons Date: Fri, 26 Aug 2022 10:46:39 -0500 Subject: [PATCH 4/8] Correct type, I honestly have no idea why it was nfloat --- src/appkit.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/appkit.cs b/src/appkit.cs index a14d7984bfbd..97dd86b7fe85 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -7458,7 +7458,7 @@ interface NSFontWidth { [Mac (13, 0)] [Field ("NSFontWidthCompressed")] - nfloat Compressed { get; } + double Compressed { get; } [Field ("NSFontWidthCondensed")] double Condensed { get; } From af24a98f9c238399656508bb860cd3e5e55d4733 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Sat, 27 Aug 2022 21:24:57 -0400 Subject: [PATCH 5/8] Apply suggestions from code review Co-authored-by: TJ Lambert <50846373+tj-devel709@users.noreply.github.com> Co-authored-by: Rolf Bjarne Kvinge --- src/appkit.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/appkit.cs b/src/appkit.cs index c4ea91d8edb8..b4cf0662a22b 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -20084,8 +20084,6 @@ partial interface NSToolbar { [NoMacCatalyst][Mac (13, 0)] [Field ("NSToolbarItemKey")] NSString NSToolbarItemKey { get; } - - } [MacCatalyst (13, 0)] @@ -28428,16 +28426,16 @@ interface NSImageSymbolConfiguration : NSCopying, NSSecureCoding [Mac (13,0)] [Static] [Export ("configurationPreferringMonochrome")] - NSImageSymbolConfiguration GetConfigurationPreferringMonochrome (); + NSImageSymbolConfiguration CreateConfigurationPreferringMonochrome (); [Mac (13,0)] [Static] [Export ("configurationPreferringHierarchical")] - NSImageSymbolConfiguration GetConfigurationPreferringHierarchical (); + NSImageSymbolConfiguration CreateConfigurationPreferringHierarchical (); } [NoMacCatalyst, Mac (13,0)] - [BaseType (typeof(NSControl))] + [BaseType (typeof (NSControl))] interface NSComboButton { [DesignatedInitializer] @@ -28493,7 +28491,7 @@ interface NSPreviewRepresentableActivityItem } [NoMacCatalyst, Mac (13,0)] - [BaseType (typeof(NSObject))] + [BaseType (typeof (NSObject))] [DisableDefaultCtor] interface NSPreviewRepresentingActivityItem : NSPreviewRepresentableActivityItem { From f6d9f075cee05aceb307c90947bd8ad4ba27e0da Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Sat, 27 Aug 2022 22:07:42 -0400 Subject: [PATCH 6/8] [UI/NSFont] Fix UIFont API and fixes NSFont object creation. Everything on both APIs is CGFloat which for us is nfloat --- src/AppKit/NSFont.cs | 11 +++++++++++ src/UIKit/UIFont.cs | 2 +- src/appkit.cs | 13 +++++++------ src/uikit.cs | 10 +++++----- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/AppKit/NSFont.cs b/src/AppKit/NSFont.cs index 0ce432439475..f303970f7d7a 100644 --- a/src/AppKit/NSFont.cs +++ b/src/AppKit/NSFont.cs @@ -222,6 +222,17 @@ public static NSFont SystemFontOfSize (nfloat fontSize, nfloat weight) return ptr == IntPtr.Zero ? null : new NSFont (ptr); } +#if NET + [SupportedOSPlatform ("macos13.0")] + [UnsupportedOSPlatform ("maccatalyst")] +#else + [Mac (13,0)] +#endif + public static NSFont SystemFontOfSize (nfloat fontSize, nfloat weight, nfloat width) { + var ptr = _SystemFontOfSize (fontSize, weight, width); + return ptr == IntPtr.Zero ? null : new NSFont (ptr); + } + #if NET [SupportedOSPlatform ("macos10.11")] [UnsupportedOSPlatform ("maccatalyst")] diff --git a/src/UIKit/UIFont.cs b/src/UIKit/UIFont.cs index 5fb3ae332b3a..76bc5677638c 100644 --- a/src/UIKit/UIFont.cs +++ b/src/UIKit/UIFont.cs @@ -183,7 +183,7 @@ static nfloat GetFontWeight (UIFontWeight weight) #else [Watch (9,0), iOS (16,0), TV (16,0), MacCatalyst (16,0)] #endif - static double GetFontWidth (UIFontWidth width) + static nfloat GetFontWidth (UIFontWidth width) { switch (width) { case UIFontWidth.Condensed: diff --git a/src/appkit.cs b/src/appkit.cs index b4cf0662a22b..f3c235b55c3b 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -6953,6 +6953,13 @@ partial interface NSFont : NSSecureCoding, NSCopying { [Internal] IntPtr _SystemFontOfSize (nfloat fontSize, nfloat weight); + [Advice ("Use constants from 'NSFontWeight' and 'NSFontWidth'.")] + [Mac (13,0)] + [Static] + [Export ("systemFontOfSize:weight:width:")] + [Internal] + IntPtr _SystemFontOfSize (nfloat fontSize, nfloat weight, nfloat width); + [Mac (10,11)] [Static] [Export ("monospacedDigitSystemFontOfSize:weight:")] @@ -6991,12 +6998,6 @@ partial interface NSFont : NSSecureCoding, NSCopying { [Mac (11,0)] [Export ("fontWithSize:")] NSFont GetFont (nfloat fontSize); - - [Advice ("Use constants from 'NSFontWeight' and 'NSFontWidth'.")] - [Mac (13,0)] - [Static] - [Export ("systemFontOfSize:weight:width:")] - NSFont GetSystemFontOfSize (nfloat fontSize, double weight, double width); } [NoMacCatalyst] diff --git a/src/uikit.cs b/src/uikit.cs index 63144f0bb05a..d931b153cae4 100644 --- a/src/uikit.cs +++ b/src/uikit.cs @@ -6223,7 +6223,7 @@ [Static] [Export ("fontNamesForFamilyName:")] [Static] [Internal] [Export ("systemFontOfSize:weight:width:")] - IntPtr _SystemFontOfSize (nfloat fontSize, double weight, double width); + IntPtr _SystemFontOfSize (nfloat fontSize, nfloat weight, nfloat width); } @@ -25376,16 +25376,16 @@ interface UIPasteControl [Watch (9,0), TV (16,0), iOS (16, 0), MacCatalyst (16,0)] interface UIFontWidthConstants { [Field ("UIFontWidthCondensed")] - double Condensed { get; } + nfloat Condensed { get; } [Field ("UIFontWidthStandard")] - double Standard { get; } + nfloat Standard { get; } [Field ("UIFontWidthExpanded")] - double Expanded { get; } + nfloat Expanded { get; } [Field ("UIFontWidthCompressed")] - double Compressed { get; } + nfloat Compressed { get; } } From 147d3c4882f8513989fbbb8535673fe7885b10df Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Sun, 28 Aug 2022 14:04:18 -0400 Subject: [PATCH 7/8] [introspection] Fix intro crasher in macOS 13 --- tests/introspection/Mac/MacApiCtorInitTest.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/introspection/Mac/MacApiCtorInitTest.cs b/tests/introspection/Mac/MacApiCtorInitTest.cs index 6ad0a1b0456f..b951153ed31a 100644 --- a/tests/introspection/Mac/MacApiCtorInitTest.cs +++ b/tests/introspection/Mac/MacApiCtorInitTest.cs @@ -290,6 +290,11 @@ protected override void CheckToString (NSObject obj) if (TestRuntime.CheckXcodeVersion (12, 0)) return; break; + // crash with xcode 14 Beta 6 + case "IOSurface.IOSurface": + if (TestRuntime.CheckXcodeVersion (14, 0)) + return; + break; default: base.CheckToString (obj); break; From c53a60dbc0be330f7d71e6d74433e08872d95e57 Mon Sep 17 00:00:00 2001 From: Alex Soto Date: Mon, 29 Aug 2022 07:59:30 -0400 Subject: [PATCH 8/8] Update src/appkit.cs Co-authored-by: Rolf Bjarne Kvinge --- src/appkit.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/appkit.cs b/src/appkit.cs index f3c235b55c3b..c88bff97ef58 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -6953,7 +6953,6 @@ partial interface NSFont : NSSecureCoding, NSCopying { [Internal] IntPtr _SystemFontOfSize (nfloat fontSize, nfloat weight); - [Advice ("Use constants from 'NSFontWeight' and 'NSFontWidth'.")] [Mac (13,0)] [Static] [Export ("systemFontOfSize:weight:width:")]