Skip to content

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

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.

Sign up for GitHub

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

Merged
chamons merged 6 commits into from
Jun 8, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ec49ed
[XM] Fix dontlink by fixing some NSAccessibility binding mistakes
chamons Jun 7, 2016
a402e29
Fix fullscreen spelling
chamons Jun 7, 2016
e4688ec
Redo better
chamons Jun 7, 2016
185486c
Fix name
chamons Jun 7, 2016
09c931b
Fix more
chamons Jun 7, 2016
387fc22
Fix more
chamons Jun 7, 2016
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
28 changes: 13 additions & 15 deletions src/appkit.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,7 @@ public interface NSCachedImageRep {
}

[BaseType (typeof (NSObject))]
public interface NSCell : NSUserInterfaceItemIdentification, NSCoding, NSCopying, NSAccessibilityElement, NSAccessibility {
public interface NSCell : NSUserInterfaceItemIdentification, NSCoding, NSCopying, NSAccessibilityElement, NSAccessibility, NSObjectAccessibilityExtensions {
[Static, Export ("prefersTrackingUntilMouseUp")]
bool PrefersTrackingUntilMouseUp { get; }

Expand Down Expand Up @@ -13727,7 +13727,7 @@ public partial interface NSTextFinder : NSCoding {

[BaseType (typeof (NSResponder))]
[Dispose ("__mt_tracking_var = null;")]
public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyContainer, NSUserInterfaceItemIdentification, NSAppearanceCustomization, NSAccessibilityElement, NSAccessibility {
public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyContainer, NSUserInterfaceItemIdentification, NSAppearanceCustomization, NSAccessibilityElement, NSAccessibility, NSObjectAccessibilityExtensions {
[Export ("initWithFrame:")]
IntPtr Constructor (CGRect frameRect);

Expand Down Expand Up @@ -18941,7 +18941,7 @@ interface NSWorkspaceFileOperationEventArgs {
public delegate void NSWorkspaceUrlHandler (NSDictionary newUrls, NSError error);

[BaseType (typeof (NSObject))]
public interface NSWorkspace {
public interface NSWorkspace : NSWorkspaceAccessibilityExtensions {
[Static]
[Export ("sharedWorkspace"), ThreadSafe]
NSWorkspace SharedWorkspace { get; }
Expand Down 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,8 +22049,8 @@ partial interface NSAccessibilityAttributes {
[Field ("NSAccessibilityDisclosedRowsAttribute")]
NSString DisclosedRowsAttribute { get; }

[Field ("NSAccessibilityDisclosedByRowsAttribute")]
NSString DisclosedByRowsAttribute { get; }
[Field ("NSAccessibilityDisclosedByRowAttribute")]
NSString DisclosedByRowAttribute { get; }

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

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

[Mac (10, 9)]
[Field ("NSAccessibilityToggleSubrole")]
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,7 +22804,6 @@ public interface NSAccessibilityLayoutItem : NSAccessibilityGroup {
void SetAccessibilityFrame (CGRect frame);
}

[Protocol, BaseType (typeof (NSObject))]
public interface NSObjectAccessibilityExtensions {
[Availability (Obsoleted = Platform.Mac_10_10, Message = "Use the NSAccessibility protocol methods instead")]
[Export ("accessibilityAttributeNames")]
Expand Down Expand Up @@ -22849,7 +22848,7 @@ public interface NSObjectAccessibilityExtensions {
[Export ("accessibilityHitTest:")]
NSObject GetAccessibilityHitTest (CGPoint point);

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

[Export ("accessibilityIndexOfChild:")]
Expand All @@ -22867,10 +22866,9 @@ public interface NSObjectAccessibilityExtensions {
}

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

[Export ("accessibilityDisplayShouldDifferentiateWithoutColor")]
bool AccessibilityDisplayShouldDifferentiateWithoutColor { get; }
Expand Down
4 changes: 4 additions & 0 deletions tests/dontlink-mac/MacApiSelectorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,10 @@ protected override bool Skip (Type type)
protected override bool Skip (Type type, string selectorName)
{
switch (selectorName) {
case "accessibilityNotifiesWhenDestroyed":
// The header declares this on an NSObject category but
// it doesn't even respondsToSelector on NSView/NSCell...
return true;
#if !XAMCORE_4_0
case "xamarinselector:removed:":
return true;
Expand Down