Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[XM] Fix dontlink by fixing some NSAccessibility binding mistakes #143

Merged
merged 6 commits into from
Jun 8, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 84 additions & 16 deletions src/appkit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22008,7 +22008,7 @@ partial interface NSAccessibilityAttributes {
NSString ColumnIndexRangeAttribute { get; }

[Mac (10, 6)]
[Field ("NSAccessibilityHoriztonalUnitsAttribute")]
[Field ("NSAccessibilityHorizontalUnitsAttribute")]
NSString HorizontalUnitsAttribute { get; }

[Mac (10, 6)]
Expand Down Expand Up @@ -22049,7 +22049,7 @@ partial interface NSAccessibilityAttributes {
[Field ("NSAccessibilityDisclosedRowsAttribute")]
NSString DisclosedRowsAttribute { get; }

[Field ("NSAccessibilityDisclosedByRowsAttribute")]
[Field ("NSAccessibilityDisclosedByRowAttribute")]
NSString DisclosedByRowsAttribute { get; }
Copy link
Contributor

Choose a reason for hiding this comment

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

Managed name should be fixed too (extra s)


[Field ("NSAccessibilityDisclosureLevelAttribute")]
Expand Down Expand Up @@ -22368,7 +22368,7 @@ public interface NSAccessibilitySubroles {
NSString DefinitionListSubrole { get; }

[Mac (10, 7)]
[Field ("NSAccessibilityFullscreenButtonSubrole")]
[Field ("NSAccessibilityFullScreenButtonSubrole")]
NSString FullscreenButtonSubrole { get; }
Copy link
Contributor

Choose a reason for hiding this comment

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

same


[Mac (10, 9)]
Expand All @@ -22392,8 +22392,8 @@ public interface NSAccessibilityNotifications {
[Field ("NSAccessibilityFocusedWindowChangedNotification")]
NSString FocusedWindowChangedNotification { get; }

[Field ("NSAccessibilityUIElementChangedNotification")]
NSString UIElementChangedNotification { get; }
[Field ("NSAccessibilityFocusedUIElementChangedNotification")]
NSString UIElementFocusedChangedNotification { get; }

[Field ("NSAccessibilityApplicationActivatedNotification")]
NSString ApplicationActivatedNotification { get; }
Expand Down Expand Up @@ -22804,11 +22804,13 @@ public interface NSAccessibilityLayoutItem : NSAccessibilityGroup {
void SetAccessibilityFrame (CGRect frame);
}

[Protocol, BaseType (typeof (NSObject))]
public interface NSObjectAccessibilityExtensions {
[BaseType (typeof (NSView))]
[Category]
public interface NSObjectAccessibilityViewExtensions {
// Please note the neary copy in NSObjectAccessibilityCellExtensions and update there as well
[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeNames")]
NSArray AccessibilityAttributeNames { get; }
NSArray GetAccessibilityAttributeNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeValue:")]
Expand All @@ -22824,15 +22826,15 @@ public interface NSObjectAccessibilityExtensions {

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityParameterizedAttributeNames")]
NSArray AccessibilityParameterizedAttributeNames { get; }
NSArray GetAccessibilityParameterizedAttributeNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeValue:forParameter:")]
NSObject GetAccessibilityValue (NSString attribute, NSObject parameter);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityActionNames")]
NSArray AccessibilityActionNames { get; }
NSArray GetAccessibilityActionNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityActionDescription:")]
Expand All @@ -22844,7 +22846,7 @@ public interface NSObjectAccessibilityExtensions {

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityIsIgnored")]
bool AccessibilityIsIgnored { get; }
bool GetAccessibilityIsIgnored ();

[Export ("accessibilityHitTest:")]
NSObject GetAccessibilityHitTest (CGPoint point);
Expand All @@ -22863,19 +22865,85 @@ public interface NSObjectAccessibilityExtensions {

[Mac (10,9)]
[Export ("accessibilityNotifiesWhenDestroyed")]
bool AccessibilityNotifiesWhenDestroyed { get; }
bool GetAccessibilityNotifiesWhenDestroyed ();
}


[BaseType (typeof (NSCell))]
[Category]
public interface NSObjectAccessibilityCellExtensions {
// Please note the neary copy in NSObjectAccessibilityViewExtensions and update there as well
[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeNames")]
NSArray GetAccessibilityAttributeNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeValue:")]
NSObject GetAccessibilityValue (NSString attribute);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityIsAttributeSettable:")]
bool IsAccessibilityAttributeSettable (NSString attribute);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilitySetValue:forAttribute:")]
void SetAccessibilityValue (NSString attribute, NSObject value);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityParameterizedAttributeNames")]
NSArray GetAccessibilityParameterizedAttributeNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeValue:forParameter:")]
NSObject GetAccessibilityValue (NSString attribute, NSObject parameter);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityActionNames")]
NSArray GetAccessibilityActionNames ();

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityActionDescription:")]
NSString GetAccessibilityActionDescription (NSString action);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityPerformAction:")]
void AccessibilityPerformAction (NSString action);

[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityIsIgnored")]
bool GetAccessibilityIsIgnored ();

[Export ("accessibilityHitTest:")]
NSObject GetAccessibilityHitTest (CGPoint point);

[Export ("getAccessibilityFocusedUIElement")]
NSObject GetAccessibilityFocusedUIElement ();

[Export ("accessibilityIndexOfChild:")]
nuint GetAccessibilityIndexOfChild (NSObject child);

[Export ("accessibilityArrayAttributeCount:")]
nuint GetAccessibilityArrayAttributeCount (NSString attribute);

[Export ("accessibilityArrayAttributeValues:index:maxCount:")]
NSObject[] GetAccessibilityArrayAttributeValues (NSString attribute, nuint index, nuint maxCount);

[Mac (10,9)]
[Export ("accessibilityNotifiesWhenDestroyed")]
bool GetAccessibilityNotifiesWhenDestroyed ();
}

[Mac (10, 10)]
[Protocol, BaseType (typeof (NSWorkspace))]
[BaseType (typeof (NSWorkspace))]
[Category]
public interface NSWorkspaceAccessibilityExtensions {
[Export ("accessibilityDisplayShouldIncreaseContract")]
bool AccessibilityDisplayShouldIncreaseContract { get; }
bool GetAccessibilityDisplayShouldIncreaseContract ();

[Export ("accessibilityDisplayShouldDifferentiateWithoutColor")]
bool AccessibilityDisplayShouldDifferentiateWithoutColor { get; }
bool GetAccessibilityDisplayShouldDifferentiateWithoutColor ();

[Export ("accessibilityDisplayShouldReduceTransparency")]
bool AccessibilityDisplayShouldReduceTransparency { get; }
bool GetAccessibilityDisplayShouldReduceTransparency ();
}
}