diff --git a/mk/xamarin.mk b/mk/xamarin.mk index 5e94539ba069..c3f996cdabf2 100644 --- a/mk/xamarin.mk +++ b/mk/xamarin.mk @@ -7,7 +7,7 @@ MONO_BRANCH := $(shell cd $(MONO_PATH) 2> /dev/null && git symbolic-ref --sho endif ifdef ENABLE_XAMARIN -NEEDED_MACCORE_VERSION := 99ad0341f436c31dcd85abcb7375c3f71072eda3 +NEEDED_MACCORE_VERSION := 536fd9a01b50df943445b057b961469da11ee1f2 NEEDED_MACCORE_BRANCH := main MACCORE_DIRECTORY := maccore diff --git a/src/AppKit/NSCollectionLayoutAnchor.cs b/src/AppKit/NSCollectionLayoutAnchor.cs index 1ce7ea6142e0..b787cd8de914 100644 --- a/src/AppKit/NSCollectionLayoutAnchor.cs +++ b/src/AppKit/NSCollectionLayoutAnchor.cs @@ -17,8 +17,8 @@ public partial class NSCollectionLayoutAnchor { public static NSCollectionLayoutAnchor Create (NSDirectionalRectEdge edges, NSCollectionLayoutAnchorOffsetType offsetType, CGPoint offset) => offsetType switch { - NSCollectionLayoutAnchorOffsetType.Absolute => _LayoutAnchorWithEdgesAbsoluteOffset (edges, offset), - NSCollectionLayoutAnchorOffsetType.Fractional => _LayoutAnchorWithEdgesFractionalOffset (edges, offset), + NSCollectionLayoutAnchorOffsetType.Absolute => CreateFromAbsoluteOffset (edges, offset), + NSCollectionLayoutAnchorOffsetType.Fractional => CreateFromFractionalOffset (edges, offset), _ => throw new ArgumentException (message: "Invalid enum value", paramName: nameof (offsetType)), }; } diff --git a/src/appkit.cs b/src/appkit.cs index df49adb14922..44423207fd46 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -5112,28 +5112,6 @@ partial interface NSCustomImageRep { NSObject Delegate { get; } } - [Mac (10,11)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] // - (instancetype)init NS_UNAVAILABLE; - interface NSDataAsset : NSCopying - { - [Export ("initWithName:")] - IntPtr Constructor (string name); - - [Export ("initWithName:bundle:")] - [DesignatedInitializer] - IntPtr Constructor (string name, NSBundle bundle); - - [Export ("name")] - string Name { get; } - - [Export ("data", ArgumentSemantic.Copy)] - NSData Data { get; } - - [Export ("typeIdentifier")] // Uniform Type Identifier - NSString TypeIdentifier { get; } - } - [BaseType (typeof (NSControl), Delegates=new string [] {"WeakDelegate"}, Events=new Type [] {typeof (NSDatePickerCellDelegate)})] interface NSDatePicker { [Export ("initWithFrame:")] @@ -14638,24 +14616,6 @@ partial interface NSStatusItem { string AutosaveName { get; set; } } - [DesignatedDefaultCtor] - [BaseType (typeof (NSObject))] - interface NSShadow : NSSecureCoding, NSCopying { - [Export ("set")] - void Set (); - - //Detected properties - [Export ("shadowOffset")] - CGSize ShadowOffset { get; set; } - - [Export ("shadowBlurRadius")] - nfloat ShadowBlurRadius { get; set; } - - [Export ("shadowColor", ArgumentSemantic.Copy)] - NSColor ShadowColor { get; set; } - - } - [Static] interface NSStringAttributeKey { [Field ("NSFontAttributeName")] @@ -18320,106 +18280,6 @@ partial interface NSTextContainer : NSSecureCoding { CGRect GetLineFragmentRect (CGRect proposedRect, nuint characterIndex, NSWritingDirection baseWritingDirection, ref CGRect remainingRect); } - [BaseType (typeof (NSMutableAttributedString), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextStorageDelegate)})] - partial interface NSTextStorage { - [Export ("initWithString:")] - IntPtr Constructor (string str); - - [Export ("addLayoutManager:")][PostGet ("LayoutManagers")] - void AddLayoutManager (NSLayoutManager obj); - - [Export ("removeLayoutManager:")][PostGet ("LayoutManagers")] - void RemoveLayoutManager (NSLayoutManager obj); - - [Export ("layoutManagers")] - NSLayoutManager [] LayoutManagers { get; } - - [Export ("edited:range:changeInLength:")] - void Edited (nuint editedMask, NSRange range, nint delta); - - [Export ("processEditing")] - void ProcessEditing (); - - [Export ("invalidateAttributesInRange:")] - void InvalidateAttributes (NSRange range); - - [Export ("ensureAttributesAreFixedInRange:")] - void EnsureAttributesAreFixed (NSRange range); - - [Export ("fixesAttributesLazily")] - bool FixesAttributesLazily { get; } - - [Export ("editedMask")] -#if !XAMCORE_4_0 - NSTextStorageEditedFlags EditedMask { get; } -#else - NSTextStorageEditActions EditedMask { get; } -#endif - - [Export ("editedRange")] - NSRange EditedRange { get; } - - [Export ("changeInLength")] - nint ChangeInLength { get; } - - //Detected properties - [Export ("delegate", ArgumentSemantic.Assign)][NullAllowed] - NSObject WeakDelegate { get; set; } - - [Wrap ("WeakDelegate")] - [Protocolize] - NSTextStorageDelegate Delegate { get; set; } - - } - - [BaseType (typeof (NSObject))] - [Model] - [Protocol] - interface NSTextStorageDelegate { - [Availability (Deprecated = Platform.Mac_10_11, Message = "Use WillProcessEditing instead.")] - [Export ("textStorageWillProcessEditing:")] - void TextStorageWillProcessEditing (NSNotification notification); - - [Availability (Deprecated = Platform.Mac_10_11, Message = "Use DidProcessEditing instead.")] - [Export ("textStorageDidProcessEditing:")] - void TextStorageDidProcessEditing (NSNotification notification); - - [Mac (10,11)] - [Export ("textStorage:willProcessEditing:range:changeInLength:"), EventArgs ("NSTextStorage")] - void WillProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); - - [Mac (10,11)] - [Export ("textStorage:didProcessEditing:range:changeInLength:"), EventArgs ("NSTextStorage")] - void DidProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); - } - - [BaseType (typeof (NSObject))] - interface NSTextTab : NSSecureCoding, NSCopying { - [DesignatedInitializer] - [Export ("initWithTextAlignment:location:options:")] - IntPtr Constructor (NSTextAlignment alignment, nfloat loc, NSDictionary options); - - [Export ("alignment")] - NSTextAlignment Alignment { get; } - - [Export ("options")] - NSDictionary Options { get; } - - [Export ("initWithType:location:")] - IntPtr Constructor (NSTextTabType type, nfloat loc); - - [Export ("location")] - nfloat Location { get; } - - [Export ("tabStopType")] - NSTextTabType TabStopType { get; } - - [Mac (10,11)] - [Static] - [Export ("columnTerminatorsForLocale:")] - NSCharacterSet GetColumnTerminators ([NullAllowed] NSLocale locale); - } - [Protocol] interface NSTextInput { @@ -23210,14 +23070,6 @@ partial interface NSTextInputContext { NSString KeyboardSelectionDidChangeNotification { get; } } - partial interface NSTextStorage { - [Notification, Field ("NSTextStorageWillProcessEditingNotification")] - NSString WillProcessEditingNotification { get; } - - [Notification, Field ("NSTextStorageDidProcessEditingNotification")] - NSString DidProcessEditingNotification { get; } - } - partial interface NSToolbarItemEventArgs { [Export ("item")] NSToolbarItem Item { get; } @@ -26654,73 +26506,6 @@ public enum NSToolbarItemGroupSelectionMode : long Momentary = 2, } - [Mac (10,15)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutAnchor : NSCopying, INSCopying - { - [Static] - [Export ("layoutAnchorWithEdges:")] - NSCollectionLayoutAnchor Create (NSDirectionalRectEdge edges); - - [Static] - [Export ("layoutAnchorWithEdges:absoluteOffset:"), Internal] - NSCollectionLayoutAnchor _LayoutAnchorWithEdgesAbsoluteOffset (NSDirectionalRectEdge edges, CGPoint absoluteOffset); - - [Static] - [Export ("layoutAnchorWithEdges:fractionalOffset:"), Internal] - NSCollectionLayoutAnchor _LayoutAnchorWithEdgesFractionalOffset (NSDirectionalRectEdge edges, CGPoint fractionalOffset); - - [Export ("edges")] - NSDirectionalRectEdge Edges { get; } - - [Export ("offset")] - CGPoint Offset { get; } - - [Export ("isAbsoluteOffset")] - bool IsAbsoluteOffset { get; } - - [Export ("isFractionalOffset")] - bool IsFractionalOffset { get; } - } - - [Mac (10,15)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutDimension : NSCopying, INSCopying - { - [Static] - [Export ("fractionalWidthDimension:")] - NSCollectionLayoutDimension CreateFractionalWidthDimension (nfloat fractionalWidth); - - [Static] - [Export ("fractionalHeightDimension:")] - NSCollectionLayoutDimension CreateFractionalHeightDimension (nfloat fractionalHeight); - - [Static] - [Export ("absoluteDimension:")] - NSCollectionLayoutDimension CreateAbsoluteDimension (nfloat absoluteDimension); - - [Static] - [Export ("estimatedDimension:")] - NSCollectionLayoutDimension CreateEstimatedDimension (nfloat estimatedDimension); - - [Export ("isFractionalWidth")] - bool IsFractionalWidth { get; } - - [Export ("isFractionalHeight")] - bool IsFractionalHeight { get; } - - [Export ("isAbsolute")] - bool IsAbsolute { get; } - - [Export ("isEstimated")] - bool IsEstimated { get; } - - [Export ("dimension")] - nfloat Dimension { get; } - } - [Mac (10,15)] [BaseType (typeof(NSTouchBarItem))] [DisableDefaultCtor] @@ -26788,161 +26573,6 @@ interface NSPickerTouchBarItem string CustomizationLabel { get; set; } } - [Mac (10,15)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutSize : NSCopying, INSCopying - { - [Static] - [Export ("sizeWithWidthDimension:heightDimension:")] - NSCollectionLayoutSize Create (NSCollectionLayoutDimension width, NSCollectionLayoutDimension height); - - [Export ("widthDimension")] - NSCollectionLayoutDimension WidthDimension { get; } - - [Export ("heightDimension")] - NSCollectionLayoutDimension HeightDimension { get; } - } - - [Mac (10,15)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutSpacing : NSCopying, INSCopying - { - [Static] - [Export ("flexibleSpacing:")] - NSCollectionLayoutSpacing CreateFlexibleSpacing (nfloat flexibleSpacing); - - [Static] - [Export ("fixedSpacing:")] - NSCollectionLayoutSpacing CreateFixedSpacing (nfloat fixedSpacing); - - [Export ("spacing")] - nfloat Spacing { get; } - - [Export ("isFlexibleSpacing")] - bool IsFlexibleSpacing { get; } - - [Export ("isFixedSpacing")] - bool IsFixedSpacing { get; } - } - - [Mac (10,15)] - [BaseType (typeof(NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutEdgeSpacing : NSCopying, INSCopying - { - [Static] - [Export ("spacingForLeading:top:trailing:bottom:")] - NSCollectionLayoutEdgeSpacing CreateSpacing ([NullAllowed] NSCollectionLayoutSpacing leading, [NullAllowed] NSCollectionLayoutSpacing top, [NullAllowed] NSCollectionLayoutSpacing trailing, [NullAllowed] NSCollectionLayoutSpacing bottom); - - [NullAllowed, Export ("leading")] - NSCollectionLayoutSpacing Leading { get; } - - [NullAllowed, Export ("top")] - NSCollectionLayoutSpacing Top { get; } - - [NullAllowed, Export ("trailing")] - NSCollectionLayoutSpacing Trailing { get; } - - [NullAllowed, Export ("bottom")] - NSCollectionLayoutSpacing Bottom { get; } - } - - [Mac (10,15)] - [BaseType (typeof (NSCollectionLayoutItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutSupplementaryItem : NSCopying - { - [Static] - [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:")] - NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor); - - [Static] - [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:itemAnchor:")] - NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor, NSCollectionLayoutAnchor itemAnchor); - - [Export ("zIndex")] - nint ZIndex { get; set; } - - [Export ("elementKind")] - string ElementKind { get; } - - [Export ("containerAnchor")] - NSCollectionLayoutAnchor ContainerAnchor { get; } - - [NullAllowed, Export ("itemAnchor")] - NSCollectionLayoutAnchor ItemAnchor { get; } - } - - [Mac (10,15)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutItem : NSCopying - { - [Static] - [Export ("itemWithLayoutSize:")] - NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize); - - [Static] - [Export ("itemWithLayoutSize:supplementaryItems:")] - NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize, NSCollectionLayoutSupplementaryItem[] supplementaryItems); - - [Export ("contentInsets", ArgumentSemantic.Assign)] - NSDirectionalEdgeInsets ContentInsets { get; set; } - - [NullAllowed, Export ("edgeSpacing", ArgumentSemantic.Copy)] - NSCollectionLayoutEdgeSpacing EdgeSpacing { get; set; } - - [Export ("layoutSize")] - NSCollectionLayoutSize LayoutSize { get; } - - [Export ("supplementaryItems")] - NSCollectionLayoutSupplementaryItem[] SupplementaryItems { get; } - } - - [Mac (10,15)] - [BaseType (typeof (NSCollectionLayoutSupplementaryItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutBoundarySupplementaryItem : NSCopying - { - [Static] - [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:")] - NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment); - - [Static] - [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:absoluteOffset:")] - NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment, CGPoint absoluteOffset); - - [Export ("extendsBoundary")] - bool ExtendsBoundary { get; set; } - - [Export ("pinToVisibleBounds")] - bool PinToVisibleBounds { get; set; } - - [Export ("alignment")] - NSRectAlignment Alignment { get; } - - [Export ("offset")] - CGPoint Offset { get; } - } - - [Mac (10,15)] - [BaseType (typeof (NSCollectionLayoutItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutDecorationItem : NSCopying - { - [Static] - [Export ("backgroundDecorationItemWithElementKind:")] - NSCollectionLayoutDecorationItem Create (string elementKind); - - [Export ("zIndex")] - nint ZIndex { get; set; } - - [Export ("elementKind")] - string ElementKind { get; } - } - [Mac (10,15)] [BaseType (typeof (NSObject))] interface NSCollectionViewCompositionalLayoutConfiguration : NSCopying diff --git a/src/gamecontroller.cs b/src/gamecontroller.cs index d590f760c19b..7a25bfb54227 100644 --- a/src/gamecontroller.cs +++ b/src/gamecontroller.cs @@ -1995,6 +1995,26 @@ enum GCInputDirectional { [Field ("GCInputDirectionalCardinalDpad")] CardinalDpad, + + [TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)] + [Field ("GCInputDirectionalCenterButton")] + CenterButton, + + [TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)] + [Field ("GCInputDirectionalTouchSurfaceButton")] + TouchSurfaceButton, + } + + [TV (15, 0), Mac (12, 0), iOS (15, 0), MacCatalyst (15,0)] + enum GCInputMicroGamepad { + [Field ("GCInputMicroGamepadDpad")] + Dpad, + + [Field ("GCInputMicroGamepadButtonA")] + ButtonA, + + [Field ("GCInputMicroGamepadButtonX")] + ButtonX, } delegate GCVirtualControllerElementConfiguration GCVirtualControllerElementUpdateBlock (GCVirtualControllerElementConfiguration configuration); @@ -2008,8 +2028,12 @@ interface GCVirtualController [Export ("virtualControllerWithConfiguration:")] GCVirtualController Create (GCVirtualControllerConfiguration configuration); + [Export ("initWithConfiguration:")] + [DesignatedInitializer] + IntPtr Constructor (GCVirtualControllerConfiguration configuration); + [Async] - [Export ("connectWithReply:")] + [Export ("connectWithReplyHandler:")] void Connect ([NullAllowed] Action reply); [Export ("disconnect")] @@ -2018,8 +2042,8 @@ interface GCVirtualController [NullAllowed, Export ("controller", ArgumentSemantic.Weak)] GCController Controller { get; } - [Export ("changeElement:configuration:")] - void Change (string element, GCVirtualControllerElementUpdateBlock configuration); + [Export ("updateConfigurationForElement:configuration:")] + void UpdateConfiguration (string element, GCVirtualControllerElementUpdateBlock configuration); } [NoTV, NoMac, NoWatch, iOS (15,0), MacCatalyst (15,0)] @@ -2035,12 +2059,12 @@ interface GCVirtualControllerConfiguration interface GCVirtualControllerElementConfiguration { [Export ("hidden")] - bool Hidden { get; set; } + bool Hidden { [Bind ("isHidden")] get; set; } [NullAllowed, Export ("path", ArgumentSemantic.Strong)] BezierPath Path { get; set; } - [Export ("touchpad")] - bool Touchpad { get; set; } + [Export ("actsAsTouchpad")] + bool ActsAsTouchpad { get; set; } } } diff --git a/src/imageio.cs b/src/imageio.cs index d71b42e4b289..3d3a220d1385 100644 --- a/src/imageio.cs +++ b/src/imageio.cs @@ -576,6 +576,9 @@ interface CGImageProperties { NSString PNGSoftware { get; } [Field ("kCGImagePropertyPNGTitle")] NSString PNGTitle { get; } + [Mac (12, 0), iOS (15, 0), TV (15,0), MacCatalyst (15,0), Watch (8,0)] + [Field ("kCGImagePropertyPNGPixelsAspectRatio")] + NSString PNGPixelsAspectRatio { get; } [iOS (9,0)][Mac (10,11)] [Field ("kCGImagePropertyPNGCompressionFilter")] diff --git a/src/uikit.cs b/src/uikit.cs index 903ca55a48a3..cef659b5f261 100644 --- a/src/uikit.cs +++ b/src/uikit.cs @@ -371,46 +371,6 @@ interface NSIdentifier { } #endif // !WATCH - [iOS (7,0)] - [BaseType (typeof (NSObject))] - interface NSTextTab : NSCoding, NSCopying, NSSecureCoding { - - [DesignatedInitializer] - [Export ("initWithTextAlignment:location:options:")] - [PostGet ("Options")] - IntPtr Constructor (UITextAlignment alignment, nfloat location, NSDictionary options); - - [Export ("alignment")] - UITextAlignment Alignment { get; } - - [Export ("location")] - nfloat Location { get; } - - [Export ("options")] - NSDictionary Options { get; } - - [Static] - [Export ("columnTerminatorsForLocale:")] - NSCharacterSet GetColumnTerminators ([NullAllowed] NSLocale locale); - - [Field ("NSTabColumnTerminatorsAttributeName")] - NSString ColumnTerminatorsAttributeName { get; } - } - - [Watch (6,0)] - [BaseType (typeof (NSObject))] - [DesignatedDefaultCtor] - interface NSShadow : NSSecureCoding, NSCopying { - [Export ("shadowOffset", ArgumentSemantic.Assign)] - CGSize ShadowOffset { get; set; } - - [Export ("shadowBlurRadius", ArgumentSemantic.Assign)] - nfloat ShadowBlurRadius { get; set; } - - [Export ("shadowColor", ArgumentSemantic.Retain), NullAllowed] - UIColor ShadowColor { get; set; } - } - #if !WATCH [Protocol] // no [Model] since it's not exposed in any API @@ -472,85 +432,6 @@ partial interface NSTextContainer : NSTextLayoutOrientationProvider, NSSecureCod bool IsSimpleRectangularTextContainer { [Bind ("isSimpleRectangularTextContainer")] get; } } - - [iOS (7,0)] - [BaseType (typeof (NSMutableAttributedString), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextStorageDelegate)})] - partial interface NSTextStorage : NSSecureCoding { - [Export ("layoutManagers")] - NSObject [] LayoutManagers { get; } - - [Export ("addLayoutManager:")] - void AddLayoutManager (NSLayoutManager aLayoutManager); - - [Export ("removeLayoutManager:")] - [PostGet ("LayoutManagers")] - void RemoveLayoutManager (NSLayoutManager aLayoutManager); - - [Export ("editedMask")] - NSTextStorageEditActions EditedMask { - get; -#if !XAMCORE_4_0 - [NotImplemented] set; -#endif - } - - [Export ("editedRange")] - NSRange EditedRange { get; -#if !XAMCORE_3_0 - [NotImplemented] set; -#endif - } - - [Export ("changeInLength")] - nint ChangeInLength { get; -#if !XAMCORE_3_0 - [NotImplemented] set; -#endif - } - - [NullAllowed] // by default this property is null - [Export ("delegate", ArgumentSemantic.Assign)] - NSObject WeakDelegate { get; set; } - - [Wrap ("WeakDelegate")] - [Protocolize] - NSTextStorageDelegate Delegate { get; set; } - - [Export ("edited:range:changeInLength:")] - void Edited (NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); - - [Export ("processEditing")] - void ProcessEditing (); - - [Export ("fixesAttributesLazily")] - bool FixesAttributesLazily { get; } - - [Export ("invalidateAttributesInRange:")] - void InvalidateAttributes (NSRange range); - - [Export ("ensureAttributesAreFixedInRange:")] - void EnsureAttributesAreFixed (NSRange range); - - [iOS (7,0)] - [Notification, Internal, Field ("NSTextStorageWillProcessEditingNotification")] - NSString WillProcessEditingNotification { get; } - - [iOS (7,0)] - [Notification, Internal, Field ("NSTextStorageDidProcessEditingNotification")] - NSString DidProcessEditingNotification { get; } - } - - [Model] - [BaseType (typeof (NSObject))] - [Protocol] - partial interface NSTextStorageDelegate { - [Export ("textStorage:willProcessEditing:range:changeInLength:")][EventArgs ("NSTextStorage")] - void WillProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); - - [Export ("textStorage:didProcessEditing:range:changeInLength:")][EventArgs ("NSTextStorage")] - void DidProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); - - } #endif // !WATCH [Category] @@ -19543,28 +19424,6 @@ interface UIPencilInteractionDelegate { } #endif // !WATCH - [iOS (9,0), Watch (2,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] // NSInvalidArgumentException Reason: -[NSDataAsset init]: unrecognized selector sent to instance 0x7f6c8cc0 - interface NSDataAsset : NSCopying { - - [Export ("initWithName:")] - IntPtr Constructor (string name); - - [DesignatedInitializer] - [Export ("initWithName:bundle:")] - IntPtr Constructor (string name, NSBundle bundle); - - [Export ("name")] - string Name { get; } - - [Export ("data", ArgumentSemantic.Copy)] - NSData Data { get; } - - [Export ("typeIdentifier")] - NSString TypeIdentifier { get; } - } - [iOS (13,0), TV (13,0), NoWatch] [BaseType (typeof (NSObject), Name = "UIOpenURLContext")] [DisableDefaultCtor] @@ -19997,228 +19856,6 @@ interface UICollectionViewCompositionalLayout { UICollectionViewCompositionalLayout GetLayout (UICollectionLayoutListConfiguration listConfiguration); } - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutItem : NSCopying { - - [Static] - [Export ("itemWithLayoutSize:")] - NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize); - - [Static] - [Export ("itemWithLayoutSize:supplementaryItems:")] - NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize, params NSCollectionLayoutSupplementaryItem [] supplementaryItems); - - [Export ("contentInsets", ArgumentSemantic.Assign)] - NSDirectionalEdgeInsets ContentInsets { get; set; } - - [NullAllowed, Export ("edgeSpacing", ArgumentSemantic.Copy)] - NSCollectionLayoutEdgeSpacing EdgeSpacing { get; set; } - - [Export ("layoutSize")] - NSCollectionLayoutSize LayoutSize { get; } - - [Export ("supplementaryItems")] - NSCollectionLayoutSupplementaryItem [] SupplementaryItems { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutDimension : NSCopying { - - [Static] - [Export ("fractionalWidthDimension:")] - NSCollectionLayoutDimension CreateFractionalWidth (nfloat fractionalWidth); - - [Static] - [Export ("fractionalHeightDimension:")] - NSCollectionLayoutDimension CreateFractionalHeight (nfloat fractionalHeight); - - [Static] - [Export ("absoluteDimension:")] - NSCollectionLayoutDimension CreateAbsolute (nfloat absoluteDimension); - - [Static] - [Export ("estimatedDimension:")] - NSCollectionLayoutDimension CreateEstimated (nfloat estimatedDimension); - - [Export ("isFractionalWidth")] - bool IsFractionalWidth { get; } - - [Export ("isFractionalHeight")] - bool IsFractionalHeight { get; } - - [Export ("isAbsolute")] - bool IsAbsolute { get; } - - [Export ("isEstimated")] - bool IsEstimated { get; } - - [Export ("dimension")] - nfloat Dimension { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutSize : NSCopying { - - [Static] - [Export ("sizeWithWidthDimension:heightDimension:")] - NSCollectionLayoutSize Create (NSCollectionLayoutDimension width, NSCollectionLayoutDimension height); - - [Export ("widthDimension")] - NSCollectionLayoutDimension WidthDimension { get; } - - [Export ("heightDimension")] - NSCollectionLayoutDimension HeightDimension { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutSpacing : NSCopying { - - [Static] - [Export ("flexibleSpacing:")] - NSCollectionLayoutSpacing CreateFlexible (nfloat flexibleSpacing); - - [Static] - [Export ("fixedSpacing:")] - NSCollectionLayoutSpacing CreateFixed (nfloat fixedSpacing); - - [Export ("spacing")] - nfloat Spacing { get; } - - [Export ("isFlexibleSpacing")] - bool IsFlexibleSpacing { get; } - - [Export ("isFixedSpacing")] - bool IsFixedSpacing { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutEdgeSpacing : NSCopying { - - [Static] - [Export ("spacingForLeading:top:trailing:bottom:")] - NSCollectionLayoutEdgeSpacing Create ([NullAllowed] NSCollectionLayoutSpacing leading, [NullAllowed] NSCollectionLayoutSpacing top, [NullAllowed] NSCollectionLayoutSpacing trailing, [NullAllowed] NSCollectionLayoutSpacing bottom); - - [NullAllowed, Export ("leading")] - NSCollectionLayoutSpacing Leading { get; } - - [NullAllowed, Export ("top")] - NSCollectionLayoutSpacing Top { get; } - - [NullAllowed, Export ("trailing")] - NSCollectionLayoutSpacing Trailing { get; } - - [NullAllowed, Export ("bottom")] - NSCollectionLayoutSpacing Bottom { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSCollectionLayoutItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutSupplementaryItem : NSCopying { - - [Static] - [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:")] - NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor); - - [Static] - [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:itemAnchor:")] - NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor, NSCollectionLayoutAnchor itemAnchor); - - [Export ("zIndex")] - nint ZIndex { get; set; } - - [Export ("elementKind")] - string ElementKind { get; } - - [Export ("containerAnchor")] - NSCollectionLayoutAnchor ContainerAnchor { get; } - - [NullAllowed, Export ("itemAnchor")] - NSCollectionLayoutAnchor ItemAnchor { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSCollectionLayoutSupplementaryItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutBoundarySupplementaryItem : NSCopying { - - [Static] - [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:")] - NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment); - - [Static] - [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:absoluteOffset:")] - NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment, CGPoint absoluteOffset); - - [Export ("extendsBoundary")] - bool ExtendsBoundary { get; set; } - - [Export ("pinToVisibleBounds")] - bool PinToVisibleBounds { get; set; } - - [Export ("alignment")] - NSRectAlignment Alignment { get; } - - [Export ("offset")] - CGPoint Offset { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSCollectionLayoutItem))] - [DisableDefaultCtor] - interface NSCollectionLayoutDecorationItem : NSCopying { - - [Static] - [Export ("backgroundDecorationItemWithElementKind:")] - NSCollectionLayoutDecorationItem Create (string elementKind); - - [Export ("zIndex")] - nint ZIndex { get; set; } - - [Export ("elementKind")] - string ElementKind { get; } - } - - [NoWatch, TV (13,0), iOS (13,0)] - [BaseType (typeof (NSObject))] - [DisableDefaultCtor] - interface NSCollectionLayoutAnchor : NSCopying { - - [Static] - [Export ("layoutAnchorWithEdges:")] - NSCollectionLayoutAnchor Create (NSDirectionalRectEdge edges); - - [Static] - [Export ("layoutAnchorWithEdges:absoluteOffset:")] - NSCollectionLayoutAnchor CreateFromAbsoluteOffset (NSDirectionalRectEdge edges, CGPoint absoluteOffset); - - [Static] - [Export ("layoutAnchorWithEdges:fractionalOffset:")] - NSCollectionLayoutAnchor CreateFromFractionalOffset (NSDirectionalRectEdge edges, CGPoint fractionalOffset); - - [Export ("edges")] - NSDirectionalRectEdge Edges { get; } - - [Export ("offset")] - CGPoint Offset { get; } - - [Export ("isAbsoluteOffset")] - bool IsAbsoluteOffset { get; } - - [Export ("isFractionalOffset")] - bool IsFractionalOffset { get; } - } - [NoWatch, TV (13,0), iOS (13,0)] [BaseType (typeof (NSObject))] [DisableDefaultCtor] diff --git a/src/xkit.cs b/src/xkit.cs index 9c8f0cb1f5dc..d1b7063d9767 100644 --- a/src/xkit.cs +++ b/src/xkit.cs @@ -30,6 +30,7 @@ using NSTextBlock=System.Object; using NSTextList=System.Object; using NSTextTableBlock=System.Object; +using NSTextTabType=System.Object; using NSTextStorageEditedFlags=System.Object; using NSTextView=System.Object; using NSTypesetter=System.Object; @@ -2167,4 +2168,476 @@ partial interface NSTextAttachment : NSTextAttachmentContainer, NSSecureCoding [Export ("textAttachmentWithImage:")] NSTextAttachment Create (Image image); } + + [NoWatch] + [MacCatalyst (13,0)] + [iOS (7,0)] + [BaseType (typeof (NSMutableAttributedString), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextStorageDelegate)})] + partial interface NSTextStorage : NSSecureCoding { +#if MONOMAC && !XAMCORE_4_0 + [Export ("initWithString:")] + IntPtr Constructor (string str); +#endif + + [Export ("layoutManagers")] +#if MONOMAC || XAMCORE_4_0 + NSLayoutManager [] LayoutManagers { get; } +#else + NSObject [] LayoutManagers { get; } +#endif + + [Export ("addLayoutManager:")] + [PostGet ("LayoutManagers")] + void AddLayoutManager (NSLayoutManager aLayoutManager); + + [Export ("removeLayoutManager:")] + [PostGet ("LayoutManagers")] + void RemoveLayoutManager (NSLayoutManager aLayoutManager); + + [Export ("editedMask")] +#if MONOMAC && !XAMCORE_4_0 + NSTextStorageEditedFlags EditedMask { +#else + NSTextStorageEditActions EditedMask { +#endif + get; +#if !XAMCORE_4_0 && !MONOMAC && !__MACCATALYST__ + [NotImplemented] set; +#endif + } + + [Export ("editedRange")] + NSRange EditedRange { + get; +#if !XAMCORE_3_0 && !MONOMAC && !__MACCATALYST__ + [NotImplemented] set; +#endif + } + + [Export ("changeInLength")] + nint ChangeInLength { + get; +#if !XAMCORE_3_0 && !MONOMAC && !__MACCATALYST__ + [NotImplemented] set; +#endif + } + + [NullAllowed] + [Export ("delegate", ArgumentSemantic.Assign)] + NSObject WeakDelegate { get; set; } + + [Wrap ("WeakDelegate")] + INSTextStorageDelegate Delegate { get; set; } + + [Export ("edited:range:changeInLength:")] +#if MONOMAC && !XAMCORE_4_0 + void Edited (nuint editedMask, NSRange editedRange, nint delta); +#else + void Edited (NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); +#endif + + [Export ("processEditing")] + void ProcessEditing (); + + [Export ("fixesAttributesLazily")] + bool FixesAttributesLazily { get; } + + [Export ("invalidateAttributesInRange:")] + void InvalidateAttributes (NSRange range); + + [Export ("ensureAttributesAreFixedInRange:")] + void EnsureAttributesAreFixed (NSRange range); + + [iOS (7,0)] + [Notification, Field ("NSTextStorageWillProcessEditingNotification")] +#if !MONOMAC || XAMCORE_4_0 + [Internal] +#endif + NSString WillProcessEditingNotification { get; } + + [iOS (7,0)] + [Notification, Field ("NSTextStorageDidProcessEditingNotification")] +#if !MONOMAC || XAMCORE_4_0 + [Internal] +#endif + NSString DidProcessEditingNotification { get; } + } + + interface INSTextStorageDelegate {} + + [NoWatch] + [MacCatalyst (13,0)] + [Model] + [BaseType (typeof (NSObject))] + [Protocol] + partial interface NSTextStorageDelegate { + [NoiOS][NoTV][NoMacCatalyst] + [Availability (Deprecated = Platform.Mac_10_11, Message = "Use WillProcessEditing instead.")] + [Export ("textStorageWillProcessEditing:")] + void TextStorageWillProcessEditing (NSNotification notification); + + [NoiOS][NoTV][NoMacCatalyst] + [Availability (Deprecated = Platform.Mac_10_11, Message = "Use DidProcessEditing instead.")] + [Export ("textStorageDidProcessEditing:")] + void TextStorageDidProcessEditing (NSNotification notification); + + [Mac (10,11)] + [Export ("textStorage:willProcessEditing:range:changeInLength:")][EventArgs ("NSTextStorage")] + void WillProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); + + [Mac (10,11)] + [Export ("textStorage:didProcessEditing:range:changeInLength:")][EventArgs ("NSTextStorage")] + void DidProcessEditing (NSTextStorage textStorage, NSTextStorageEditActions editedMask, NSRange editedRange, nint delta); + } + + [NoWatch, TV (13,0), iOS (13,0)] + [Mac (10,15)] + [MacCatalyst (13, 0)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutAnchor : NSCopying, INSCopying + { + [Static] + [Export ("layoutAnchorWithEdges:")] + NSCollectionLayoutAnchor Create (NSDirectionalRectEdge edges); + + [Static] + [Export ("layoutAnchorWithEdges:absoluteOffset:")] + NSCollectionLayoutAnchor CreateFromAbsoluteOffset (NSDirectionalRectEdge edges, CGPoint absoluteOffset); + + [Static] + [Export ("layoutAnchorWithEdges:fractionalOffset:")] + NSCollectionLayoutAnchor CreateFromFractionalOffset (NSDirectionalRectEdge edges, CGPoint fractionalOffset); + + [Export ("edges")] + NSDirectionalRectEdge Edges { get; } + + [Export ("offset")] + CGPoint Offset { get; } + + [Export ("isAbsoluteOffset")] + bool IsAbsoluteOffset { get; } + + [Export ("isFractionalOffset")] + bool IsFractionalOffset { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [Mac (10,15)] + [MacCatalyst (13, 0)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutDimension : NSCopying + { + [Static] + [Export ("fractionalWidthDimension:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutDimension CreateFractionalWidthDimension (nfloat fractionalWidth); +#else + NSCollectionLayoutDimension CreateFractionalWidth (nfloat fractionalWidth); +#endif + + [Static] + [Export ("fractionalHeightDimension:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutDimension CreateFractionalHeightDimension (nfloat fractionalHeight); +#else + NSCollectionLayoutDimension CreateFractionalHeight (nfloat fractionalHeight); +#endif + + [Static] + [Export ("absoluteDimension:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutDimension CreateAbsoluteDimension (nfloat absoluteDimension); +#else + NSCollectionLayoutDimension CreateAbsolute (nfloat absoluteDimension); +#endif + + [Static] + [Export ("estimatedDimension:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutDimension CreateEstimatedDimension (nfloat estimatedDimension); +#else + NSCollectionLayoutDimension CreateEstimated (nfloat estimatedDimension); +#endif + + [Export ("isFractionalWidth")] + bool IsFractionalWidth { get; } + + [Export ("isFractionalHeight")] + bool IsFractionalHeight { get; } + + [Export ("isAbsolute")] + bool IsAbsolute { get; } + + [Export ("isEstimated")] + bool IsEstimated { get; } + + [Export ("dimension")] + nfloat Dimension { get; } + } + + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutSize : NSCopying + { + [Static] + [Export ("sizeWithWidthDimension:heightDimension:")] + NSCollectionLayoutSize Create (NSCollectionLayoutDimension width, NSCollectionLayoutDimension height); + + [Export ("widthDimension")] + NSCollectionLayoutDimension WidthDimension { get; } + + [Export ("heightDimension")] + NSCollectionLayoutDimension HeightDimension { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutSpacing : NSCopying + { + [Static] + [Export ("flexibleSpacing:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutSpacing CreateFlexibleSpacing (nfloat flexibleSpacing); +#else + NSCollectionLayoutSpacing CreateFlexible (nfloat flexibleSpacing); +#endif + + [Static] + [Export ("fixedSpacing:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutSpacing CreateFixedSpacing (nfloat fixedSpacing); +#else + NSCollectionLayoutSpacing CreateFixed (nfloat fixedSpacing); +#endif + + [Export ("spacing")] + nfloat Spacing { get; } + + [Export ("isFlexibleSpacing")] + bool IsFlexibleSpacing { get; } + + [Export ("isFixedSpacing")] + bool IsFixedSpacing { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutEdgeSpacing : NSCopying + { + [Static] + [Export ("spacingForLeading:top:trailing:bottom:")] +#if MONOMAC && !XAMCORE_4_0 + NSCollectionLayoutEdgeSpacing CreateSpacing ([NullAllowed] NSCollectionLayoutSpacing leading, [NullAllowed] NSCollectionLayoutSpacing top, [NullAllowed] NSCollectionLayoutSpacing trailing, [NullAllowed] NSCollectionLayoutSpacing bottom); +#else + NSCollectionLayoutEdgeSpacing Create ([NullAllowed] NSCollectionLayoutSpacing leading, [NullAllowed] NSCollectionLayoutSpacing top, [NullAllowed] NSCollectionLayoutSpacing trailing, [NullAllowed] NSCollectionLayoutSpacing bottom); +#endif + + [NullAllowed, Export ("leading")] + NSCollectionLayoutSpacing Leading { get; } + + [NullAllowed, Export ("top")] + NSCollectionLayoutSpacing Top { get; } + + [NullAllowed, Export ("trailing")] + NSCollectionLayoutSpacing Trailing { get; } + + [NullAllowed, Export ("bottom")] + NSCollectionLayoutSpacing Bottom { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSCollectionLayoutItem))] + [DisableDefaultCtor] + interface NSCollectionLayoutSupplementaryItem : NSCopying + { + [Static] + [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:")] + NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor); + + [Static] + [Export ("supplementaryItemWithLayoutSize:elementKind:containerAnchor:itemAnchor:")] + NSCollectionLayoutSupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSCollectionLayoutAnchor containerAnchor, NSCollectionLayoutAnchor itemAnchor); + + [Export ("zIndex")] + nint ZIndex { get; set; } + + [Export ("elementKind")] + string ElementKind { get; } + + [Export ("containerAnchor")] + NSCollectionLayoutAnchor ContainerAnchor { get; } + + [NullAllowed, Export ("itemAnchor")] + NSCollectionLayoutAnchor ItemAnchor { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] + interface NSCollectionLayoutItem : NSCopying + { + [Static] + [Export ("itemWithLayoutSize:")] + NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize); + + [Static] + [Export ("itemWithLayoutSize:supplementaryItems:")] + NSCollectionLayoutItem Create (NSCollectionLayoutSize layoutSize, params NSCollectionLayoutSupplementaryItem[] supplementaryItems); + + [Export ("contentInsets", ArgumentSemantic.Assign)] + NSDirectionalEdgeInsets ContentInsets { get; set; } + + [NullAllowed, Export ("edgeSpacing", ArgumentSemantic.Copy)] + NSCollectionLayoutEdgeSpacing EdgeSpacing { get; set; } + + [Export ("layoutSize")] + NSCollectionLayoutSize LayoutSize { get; } + + [Export ("supplementaryItems")] + NSCollectionLayoutSupplementaryItem[] SupplementaryItems { get; } + } + + [NoWatch, TV (13,0), iOS (13,0)] + [MacCatalyst (13, 0)] + [Mac (10,15)] + [BaseType (typeof (NSCollectionLayoutSupplementaryItem))] + [DisableDefaultCtor] + interface NSCollectionLayoutBoundarySupplementaryItem : NSCopying + { + [Static] + [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:")] + NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment); + + [Static] + [Export ("boundarySupplementaryItemWithLayoutSize:elementKind:alignment:absoluteOffset:")] + NSCollectionLayoutBoundarySupplementaryItem Create (NSCollectionLayoutSize layoutSize, string elementKind, NSRectAlignment alignment, CGPoint absoluteOffset); + + [Export ("extendsBoundary")] + bool ExtendsBoundary { get; set; } + + [Export ("pinToVisibleBounds")] + bool PinToVisibleBounds { get; set; } + + [Export ("alignment")] + NSRectAlignment Alignment { get; } + + [Export ("offset")] + CGPoint Offset { get; } + } + + [MacCatalyst (13, 0)] + [NoWatch, TV (13,0), iOS (13,0)] + [Mac (10,15)] + [BaseType (typeof (NSCollectionLayoutItem))] + [DisableDefaultCtor] + interface NSCollectionLayoutDecorationItem : NSCopying + { + [Static] + [Export ("backgroundDecorationItemWithElementKind:")] + NSCollectionLayoutDecorationItem Create (string elementKind); + + [Export ("zIndex")] + nint ZIndex { get; set; } + + [Export ("elementKind")] + string ElementKind { get; } + } + + [iOS (9,0), Watch (2,0)] + [MacCatalyst (13,0)] + [Mac (10,11)] + [BaseType (typeof (NSObject))] + [DisableDefaultCtor] // - (instancetype)init NS_UNAVAILABLE; + interface NSDataAsset : NSCopying + { + [Export ("initWithName:")] + IntPtr Constructor (string name); + + [Export ("initWithName:bundle:")] + [DesignatedInitializer] + IntPtr Constructor (string name, NSBundle bundle); + + [Export ("name")] + string Name { get; } + + [Export ("data", ArgumentSemantic.Copy)] + NSData Data { get; } + + [Export ("typeIdentifier")] // Uniform Type Identifier + NSString TypeIdentifier { get; } + } + + [MacCatalyst (13,0)] + [Watch (6,0)] + [BaseType (typeof (NSObject))] + [DesignatedDefaultCtor] + interface NSShadow : NSSecureCoding, NSCopying { + [NoiOS][NoMacCatalyst][NoTV][NoWatch] + [Export ("set")] + void Set (); + + [Export ("shadowOffset", ArgumentSemantic.Assign)] + CGSize ShadowOffset { get; set; } + + [Export ("shadowBlurRadius", ArgumentSemantic.Assign)] + nfloat ShadowBlurRadius { get; set; } + +#if MONOMAC + [Export ("shadowColor", ArgumentSemantic.Copy)] +#else + [Export ("shadowColor", ArgumentSemantic.Retain), NullAllowed] +#endif + NSColor ShadowColor { get; set; } + } + + [iOS (7,0)] + [MacCatalyst (13,0)] + [BaseType (typeof (NSObject))] + interface NSTextTab : NSSecureCoding, NSCopying { + [DesignatedInitializer] + [Export ("initWithTextAlignment:location:options:")] + [PostGet ("Options")] + IntPtr Constructor (TextAlignment alignment, nfloat location, NSDictionary options); + + [NoiOS][NoMacCatalyst][NoTV][NoWatch] + [Export ("initWithType:location:")] + IntPtr Constructor (NSTextTabType type, nfloat location); + + [Export ("alignment")] + TextAlignment Alignment { get; } + + [Export ("options")] + NSDictionary Options { get; } + + [Export ("location")] + nfloat Location { get; } + + [NoiOS][NoMacCatalyst][NoTV][NoWatch] + [Export ("tabStopType")] + NSTextTabType TabStopType { get; } + + [Mac (10,11)] + [Static] + [Export ("columnTerminatorsForLocale:")] + NSCharacterSet GetColumnTerminators ([NullAllowed] NSLocale locale); + + [Field ("NSTabColumnTerminatorsAttributeName")] + NSString ColumnTerminatorsAttributeName { get; } + } } diff --git a/tests/xtro-sharpie/MacCatalyst-GameController.todo b/tests/xtro-sharpie/MacCatalyst-GameController.todo deleted file mode 100644 index 4527b6accfb2..000000000000 --- a/tests/xtro-sharpie/MacCatalyst-GameController.todo +++ /dev/null @@ -1,11 +0,0 @@ -!missing-field! GCInputDirectionalCenterButton not bound -!missing-field! GCInputDirectionalTouchSurfaceButton not bound -!missing-field! GCInputMicroGamepadButtonA not bound -!missing-field! GCInputMicroGamepadButtonX not bound -!missing-field! GCInputMicroGamepadDpad not bound -!missing-selector! GCVirtualController::connectWithReplyHandler: not bound -!missing-selector! GCVirtualController::initWithConfiguration: not bound -!missing-selector! GCVirtualController::updateConfigurationForElement:configuration: not bound -!missing-selector! GCVirtualControllerElementConfiguration::actsAsTouchpad not bound -!missing-selector! GCVirtualControllerElementConfiguration::isHidden not bound -!missing-selector! GCVirtualControllerElementConfiguration::setActsAsTouchpad: not bound diff --git a/tests/xtro-sharpie/MacCatalyst-ImageIO.todo b/tests/xtro-sharpie/MacCatalyst-ImageIO.todo deleted file mode 100644 index b5a8ec1f4414..000000000000 --- a/tests/xtro-sharpie/MacCatalyst-ImageIO.todo +++ /dev/null @@ -1 +0,0 @@ -!missing-field! kCGImagePropertyPNGPixelsAspectRatio not bound diff --git a/tests/xtro-sharpie/iOS-GameController.todo b/tests/xtro-sharpie/iOS-GameController.todo deleted file mode 100644 index 4527b6accfb2..000000000000 --- a/tests/xtro-sharpie/iOS-GameController.todo +++ /dev/null @@ -1,11 +0,0 @@ -!missing-field! GCInputDirectionalCenterButton not bound -!missing-field! GCInputDirectionalTouchSurfaceButton not bound -!missing-field! GCInputMicroGamepadButtonA not bound -!missing-field! GCInputMicroGamepadButtonX not bound -!missing-field! GCInputMicroGamepadDpad not bound -!missing-selector! GCVirtualController::connectWithReplyHandler: not bound -!missing-selector! GCVirtualController::initWithConfiguration: not bound -!missing-selector! GCVirtualController::updateConfigurationForElement:configuration: not bound -!missing-selector! GCVirtualControllerElementConfiguration::actsAsTouchpad not bound -!missing-selector! GCVirtualControllerElementConfiguration::isHidden not bound -!missing-selector! GCVirtualControllerElementConfiguration::setActsAsTouchpad: not bound diff --git a/tests/xtro-sharpie/iOS-ImageIO.todo b/tests/xtro-sharpie/iOS-ImageIO.todo deleted file mode 100644 index b5a8ec1f4414..000000000000 --- a/tests/xtro-sharpie/iOS-ImageIO.todo +++ /dev/null @@ -1 +0,0 @@ -!missing-field! kCGImagePropertyPNGPixelsAspectRatio not bound diff --git a/tests/xtro-sharpie/macOS-AppKit.ignore b/tests/xtro-sharpie/macOS-AppKit.ignore index 220adfad4040..d77679b06f92 100644 --- a/tests/xtro-sharpie/macOS-AppKit.ignore +++ b/tests/xtro-sharpie/macOS-AppKit.ignore @@ -503,7 +503,6 @@ !missing-field! NSSpellCheckerDidChangeAutomaticDashSubstitutionNotification not bound !missing-field! NSSpellCheckerDidChangeAutomaticQuoteSubstitutionNotification not bound !missing-field! NSSubjectDocumentAttribute not bound -!missing-field! NSTabColumnTerminatorsAttributeName not bound !missing-field! NSTargetBinding not bound !missing-field! NSTextColorBinding not bound !missing-field! NSTextEffectLetterpressStyle not bound diff --git a/tests/xtro-sharpie/macOS-GameController.todo b/tests/xtro-sharpie/macOS-GameController.todo deleted file mode 100644 index b4b4b4500e69..000000000000 --- a/tests/xtro-sharpie/macOS-GameController.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-field! GCInputDirectionalCenterButton not bound -!missing-field! GCInputDirectionalTouchSurfaceButton not bound -!missing-field! GCInputMicroGamepadButtonA not bound -!missing-field! GCInputMicroGamepadButtonX not bound -!missing-field! GCInputMicroGamepadDpad not bound diff --git a/tests/xtro-sharpie/macOS-ImageIO.todo b/tests/xtro-sharpie/macOS-ImageIO.todo deleted file mode 100644 index b5a8ec1f4414..000000000000 --- a/tests/xtro-sharpie/macOS-ImageIO.todo +++ /dev/null @@ -1 +0,0 @@ -!missing-field! kCGImagePropertyPNGPixelsAspectRatio not bound diff --git a/tests/xtro-sharpie/tvOS-GameController.todo b/tests/xtro-sharpie/tvOS-GameController.todo deleted file mode 100644 index b4b4b4500e69..000000000000 --- a/tests/xtro-sharpie/tvOS-GameController.todo +++ /dev/null @@ -1,5 +0,0 @@ -!missing-field! GCInputDirectionalCenterButton not bound -!missing-field! GCInputDirectionalTouchSurfaceButton not bound -!missing-field! GCInputMicroGamepadButtonA not bound -!missing-field! GCInputMicroGamepadButtonX not bound -!missing-field! GCInputMicroGamepadDpad not bound diff --git a/tests/xtro-sharpie/tvOS-ImageIO.todo b/tests/xtro-sharpie/tvOS-ImageIO.todo deleted file mode 100644 index b5a8ec1f4414..000000000000 --- a/tests/xtro-sharpie/tvOS-ImageIO.todo +++ /dev/null @@ -1 +0,0 @@ -!missing-field! kCGImagePropertyPNGPixelsAspectRatio not bound diff --git a/tests/xtro-sharpie/watchOS-ImageIO.todo b/tests/xtro-sharpie/watchOS-ImageIO.todo deleted file mode 100644 index b5a8ec1f4414..000000000000 --- a/tests/xtro-sharpie/watchOS-ImageIO.todo +++ /dev/null @@ -1 +0,0 @@ -!missing-field! kCGImagePropertyPNGPixelsAspectRatio not bound