From bf88adadafa71f899ca8310555d43407dada63d5 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Thu, 4 Jun 2020 18:36:32 +0200 Subject: [PATCH] [src] Remove Classic code from AppKit. (#8757) --- src/AppKit/Enums.cs | 89 ------------ src/AppKit/NSAppleEventManager.cs | 11 -- src/AppKit/NSApplicationDelegate.cs | 39 ------ src/AppKit/NSColor.cs | 8 -- src/AppKit/NSComboBoxCell.cs | 15 -- src/AppKit/NSGestureRecognizer.cs | 4 - src/AppKit/NSPasteboard.cs | 11 -- src/AppKit/NSPathControlItem.cs | 2 +- src/AppKit/NSResponder.cs | 12 -- src/AppKit/NSStringAttributes.cs | 158 --------------------- src/AppKit/XEnums.cs | 15 -- src/appkit.cs | 210 +--------------------------- src/frameworks.sources | 4 - 13 files changed, 4 insertions(+), 574 deletions(-) delete mode 100644 src/AppKit/NSAppleEventManager.cs delete mode 100644 src/AppKit/NSApplicationDelegate.cs delete mode 100644 src/AppKit/NSComboBoxCell.cs delete mode 100644 src/AppKit/NSResponder.cs diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index 62424fa42d..63ce9c3c62 100644 --- a/src/AppKit/Enums.cs +++ b/src/AppKit/Enums.cs @@ -300,11 +300,7 @@ namespace AppKit { [Flags] [Native] -#if XAMCORE_2_0 public enum NSCellStyleMask : ulong { -#else - public enum NSCellMask : ulong { -#endif NoCell = 0, ContentsCell = 1 << 0, PushInCell = 1 << 1, @@ -495,11 +491,7 @@ namespace AppKit { [Flags] [Native] -#if XAMCORE_2_0 public enum NSEventButtonMask : ulong { -#else - public enum NSPointingDeviceMask : ulong { -#endif Pen = 1, PenLower = 2, PenUpper = 4 } @@ -598,7 +590,6 @@ namespace AppKit { JISKeypadComma = 0x5F, JISEisu = 0x66, JISKana = 0x68, -#if XAMCORE_2_0 F18 = 0x4F, F19 = 0x50, F20 = 0x5A, @@ -627,79 +618,6 @@ namespace AppKit { RightArrow = 0x7C, DownArrow = 0x7D, UpArrow = 0x7E -#else - UpArrow = 0xF700, - DownArrow = 0xF701, - LeftArrow = 0xF702, - RightArrow = 0xF703, - F1 = 0xF704, - F2 = 0xF705, - F3 = 0xF706, - F4 = 0xF707, - F5 = 0xF708, - F6 = 0xF709, - F7 = 0xF70A, - F8 = 0xF70B, - F9 = 0xF70C, - F10 = 0xF70D, - F11 = 0xF70E, - F12 = 0xF70F, - F13 = 0xF710, - F14 = 0xF711, - F15 = 0xF712, - F16 = 0xF713, - F17 = 0xF714, - F18 = 0xF715, - F19 = 0xF716, - F20 = 0xF717, - F21 = 0xF718, - F22 = 0xF719, - F23 = 0xF71A, - F24 = 0xF71B, - F25 = 0xF71C, - F26 = 0xF71D, - F27 = 0xF71E, - F28 = 0xF71F, - F29 = 0xF720, - F30 = 0xF721, - F31 = 0xF722, - F32 = 0xF723, - F33 = 0xF724, - F34 = 0xF725, - F35 = 0xF726, - Insert = 0xF727, - Home = 0xF729, - Begin = 0xF72A, - End = 0xF72B, - PageUp = 0xF72C, - PageDown = 0xF72D, - PrintScreen = 0xF72E, - ScrollLock = 0xF72F, - Pause = 0xF730, - SysReq = 0xF731, - Break = 0xF732, - Reset = 0xF733, - Stop = 0xF734, - Menu = 0xF735, - User = 0xF736, - System = 0xF737, - Print = 0xF738, - ClearLine = 0xF739, - ClearDisplay = 0xF73A, - InsertLine = 0xF73B, - DeleteLine = 0xF73C, - InsertChar = 0xF73D, - DeleteChar = 0xF73E, - Prev = 0xF73F, - Next = 0xF740, - Select = 0xF741, - Execute = 0xF742, - Undo = 0xF743, - Redo = 0xF744, - Find = 0xF745, - Help = 0xF746, - ModeSwitch = 0xF747 -#endif } #if !XAMCORE_4_0 @@ -1846,17 +1764,10 @@ namespace AppKit { [Native] public enum NSPathStyle : long { -#if XAMCORE_2_0 Standard, [Deprecated (PlatformName.MacOSX, 10, 7)] NavigationBar, PopUp -#else - NSPathStyleStandard, - [Deprecated (PlatformName.MacOSX, 10, 7)] - NSPathStyleNavigationBar, - NSPathStylePopUp -#endif } [Native] diff --git a/src/AppKit/NSAppleEventManager.cs b/src/AppKit/NSAppleEventManager.cs deleted file mode 100644 index 4c3eb2099e..0000000000 --- a/src/AppKit/NSAppleEventManager.cs +++ /dev/null @@ -1,11 +0,0 @@ - -namespace Foundation { - partial class NSAppleEventManager { -#if !XAMCORE_2_0 - public void RemoveEventHandler (AEEventClass eventClass, AEEventID eventID) - { - RemoveEventHandlerForEventClassandEventID (eventClass, eventID); - } -#endif - } -} \ No newline at end of file diff --git a/src/AppKit/NSApplicationDelegate.cs b/src/AppKit/NSApplicationDelegate.cs deleted file mode 100644 index 35237384e4..0000000000 --- a/src/AppKit/NSApplicationDelegate.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// Copyright 2010, Novell, Inc. -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// -using System; -using System.Runtime.InteropServices; -using Foundation; -using ObjCRuntime; - -namespace AppKit { - public partial class NSApplicationDelegate : NSObject { -#if !XAMCORE_2_0 - [Obsolete ("Use 'DidFinishLaunching (NSNotification)' instead.")] - [Export ("applicationDidFinishLaunching:")] - public virtual void FinishedLaunching (NSObject notification) - { - throw new Exception ("model"); - } -#endif - } -} diff --git a/src/AppKit/NSColor.cs b/src/AppKit/NSColor.cs index 1d8f906d76..6690a2d734 100644 --- a/src/AppKit/NSColor.cs +++ b/src/AppKit/NSColor.cs @@ -191,11 +191,7 @@ namespace AppKit { try { pNativeFloatArray = Marshal.AllocHGlobal (components.Length * IntPtr.Size); -#if XAMCORE_2_0 nfloat.CopyArray (components, 0, pNativeFloatArray, components.Length); -#else - Marshal.Copy (components, 0, pNativeFloatArray, components.Length); -#endif return _FromColorSpace (space, pNativeFloatArray, components.Length); } finally { Marshal.FreeHGlobal (pNativeFloatArray); @@ -212,11 +208,7 @@ namespace AppKit { pNativeFloatArray = Marshal.AllocHGlobal (count * IntPtr.Size); _GetComponents (pNativeFloatArray); -#if XAMCORE_2_0 nfloat.CopyArray (pNativeFloatArray, components, 0, count); -#else - Marshal.Copy (pNativeFloatArray, components, 0, count); -#endif } finally { Marshal.FreeHGlobal (pNativeFloatArray); } diff --git a/src/AppKit/NSComboBoxCell.cs b/src/AppKit/NSComboBoxCell.cs deleted file mode 100644 index cc9c4a1204..0000000000 --- a/src/AppKit/NSComboBoxCell.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; - -using CoreGraphics; - -namespace AppKit { - - public partial class NSComboBoxCell { -#if !XAMCORE_2_0 - [Obsolete] - public NSComboBoxCell (CGRect frameRect) - { - } -#endif - } -} diff --git a/src/AppKit/NSGestureRecognizer.cs b/src/AppKit/NSGestureRecognizer.cs index bac21906eb..153506116d 100644 --- a/src/AppKit/NSGestureRecognizer.cs +++ b/src/AppKit/NSGestureRecognizer.cs @@ -15,11 +15,7 @@ namespace AppKit { public partial class NSGestureRecognizer { object recognizers; static Selector tsel = new Selector ("target"); -#if XAMCORE_2_0 internal static Selector ParametrizedSelector = new Selector ("target:"); -#else - public static Selector ParametrizedSelector = new Selector ("target:"); -#endif public NSGestureRecognizer (Action action) : this (tsel, new ParameterlessDispatch (action)) { diff --git a/src/AppKit/NSPasteboard.cs b/src/AppKit/NSPasteboard.cs index c905735164..5825b68e86 100644 --- a/src/AppKit/NSPasteboard.cs +++ b/src/AppKit/NSPasteboard.cs @@ -7,17 +7,6 @@ using ObjCRuntime; namespace AppKit { public partial class NSPasteboard { -#if !XAMCORE_2_0 - // This is a stable API we can't break, even if it is all kinds of wrong - public bool WriteObjects (NSPasteboardReading [] objects) - { - var nsa_pasteboardReading = NSArray.FromNSObjects (objects); - bool result = WriteObjects (nsa_pasteboardReading.Handle); - nsa_pasteboardReading.Dispose (); - return result; - } -#endif - public bool WriteObjects (INSPasteboardWriting [] objects) { var nsa_pasteboardReading = NSArray.FromNSObjects (objects); diff --git a/src/AppKit/NSPathControlItem.cs b/src/AppKit/NSPathControlItem.cs index 11c4094189..558224f214 100644 --- a/src/AppKit/NSPathControlItem.cs +++ b/src/AppKit/NSPathControlItem.cs @@ -7,7 +7,7 @@ namespace AppKit { : INSCoding #endif { -#if XAMCORE_2_0 && !XAMCORE_3_0 +#if !XAMCORE_3_0 public NSPathControlItem (NSCoder coder) : this () { } diff --git a/src/AppKit/NSResponder.cs b/src/AppKit/NSResponder.cs deleted file mode 100644 index 0de6af14bb..0000000000 --- a/src/AppKit/NSResponder.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Foundation; - -namespace AppKit { - partial class NSResponder { -#if !XAMCORE_2_0 - public NSObject ValidRequestorForSendType (string sendType, string returnType) - { - return ValidRequestorForSendTypereturnType (sendType, returnType); - } -#endif - } -} \ No newline at end of file diff --git a/src/AppKit/NSStringAttributes.cs b/src/AppKit/NSStringAttributes.cs index fdb66af45b..d76a6750ff 100644 --- a/src/AppKit/NSStringAttributes.cs +++ b/src/AppKit/NSStringAttributes.cs @@ -220,7 +220,6 @@ namespace AppKit set { Link = value; } } -#if XAMCORE_2_0 public NSFont Font { get { return Get (NSStringAttributeKey.Font, handle => new NSFont (handle)); } set { SetNativeValue (NSStringAttributeKey.Font, value); } @@ -376,162 +375,5 @@ namespace AppKit get { return (NSSpellingState?)GetInt32Value (NSStringAttributeKey.SpellingState); } set { SetNumberValue (NSStringAttributeKey.SpellingState, (int?)value); } } -#else - public NSFont Font { - get { return Get (NSAttributedString.FontAttributeName, handle => new NSFont (handle)); } - set { SetNativeValue (NSAttributedString.FontAttributeName, value); } - } - - public NSParagraphStyle ParagraphStyle { - get { return Get (NSAttributedString.ParagraphStyleAttributeName, handle => new NSParagraphStyle (handle)); } - set { SetNativeValue (NSAttributedString.ParagraphStyleAttributeName, value); } - } - - public NSColor ForegroundColor { - get { return Get (NSAttributedString.ForegroundColorAttributeName, handle => new NSColor (handle)); } - set { SetNativeValue (NSAttributedString.ForegroundColorAttributeName, value); } - } - - public int? UnderlineStyle { - get { return GetInt32Value (NSAttributedString.UnderlineStyleAttributeName); } - set { SetNumberValue (NSAttributedString.UnderlineStyleAttributeName, value); } - } - - public int SetUnderlineStyle (NSUnderlineStyle style = NSUnderlineStyle.None, - NSUnderlinePattern pattern = NSUnderlinePattern.Solid, bool byWord = false) - { - return SetUnderlineStyle (NSAttributedString.UnderlineStyleAttributeName, style, pattern, byWord); - } - - public bool? Superscript { - get { return GetBool (NSAttributedString.SuperscriptAttributeName); } - set { Set (NSAttributedString.SuperscriptAttributeName, value); } - } - - public NSColor BackgroundColor { - get { return Get (NSAttributedString.BackgroundColorAttributeName, handle => new NSColor (handle)); } - set { SetNativeValue (NSAttributedString.BackgroundColorAttributeName, value); } - } - - public NSTextAttachment Attachment { - get { return Get (NSAttributedString.AttachmentAttributeName, handle => new NSTextAttachment (handle)); } - set { SetNativeValue (NSAttributedString.AttachmentAttributeName, value); } - } - - public NSLigatureType? Ligature { - get { return (NSLigatureType?)GetInt32Value (NSAttributedString.LigatureAttributeName); } - set { SetNumberValue (NSAttributedString.LigatureAttributeName, (int?)value); } - } - - public float? BaselineOffset { - get { return GetFloatValue (NSAttributedString.BaselineOffsetAttributeName); } - set { SetNumberValue (NSAttributedString.BaselineOffsetAttributeName, value); } - } - - public float? KerningAdjustment { - get { return GetFloatValue (NSAttributedString.KernAttributeName); } - set { SetNumberValue (NSAttributedString.KernAttributeName, value); } - } - - NSObject Link { - get { - var handle = Get (NSAttributedString.LinkAttributeName); - return handle == IntPtr.Zero ? null : Runtime.GetNSObject (handle); - } - - set { SetNativeValue (NSAttributedString.LinkAttributeName, value); } - } - - public float? StrokeWidth { - get { return GetFloatValue (NSAttributedString.StrokeWidthAttributeName); } - set { SetNumberValue (NSAttributedString.StrokeWidthAttributeName, value); } - } - - public NSColor StrokeColor { - get { return Get (NSAttributedString.StrokeColorAttributeName, handle => new NSColor (handle)); } - set { SetNativeValue (NSAttributedString.StrokeColorAttributeName, value); } - } - - public NSColor UnderlineColor { - get { return Get (NSAttributedString.UnderlineColorAttributeName, handle => new NSColor (handle)); } - set { SetNativeValue (NSAttributedString.UnderlineColorAttributeName, value); } - } - - public int? StrikethroughStyle { - get { return GetInt32Value (NSAttributedString.StrikethroughStyleAttributeName); } - set { SetNumberValue (NSAttributedString.StrikethroughStyleAttributeName, value); } - } - - public int SetStrikethroughStyle (NSUnderlineStyle style = NSUnderlineStyle.None, - NSUnderlinePattern pattern = NSUnderlinePattern.Solid, bool byWord = false) - { - return SetUnderlineStyle (NSAttributedString.StrikethroughStyleAttributeName, style, pattern, byWord); - } - - public NSColor StrikethroughColor { - get { return Get (NSAttributedString.StrikethroughColorAttributeName, handle => new NSColor (handle)); } - set { SetNativeValue (NSAttributedString.StrikethroughColorAttributeName, value); } - } - - public NSShadow Shadow { - get { return Get (NSAttributedString.ShadowAttributeName, handle => new NSShadow (handle)); } - set { SetNativeValue (NSAttributedString.ShadowAttributeName, value); } - } - - public float? Obliqueness { - get { return GetFloatValue (NSAttributedString.ObliquenessAttributeName); } - set { SetNumberValue (NSAttributedString.ObliquenessAttributeName, value); } - } - - public float? Expansion { - get { return GetFloatValue (NSAttributedString.ExpansionAttributeName); } - set { SetNumberValue (NSAttributedString.ExpansionAttributeName, value); } - } - - public NSCursor Cursor { - get { return Get (NSAttributedString.CursorAttributeName, handle => new NSCursor (handle)); } - set { SetNativeValue (NSAttributedString.CursorAttributeName, value); } - } - - public string ToolTip { - get { return Get (NSAttributedString.ToolTipAttributeName, handle => new NSString (handle)); } - set { SetNativeValue (NSAttributedString.ToolTipAttributeName, new NSString (value)); } - } - - public int? CharacterShape { - get { return GetInt32Value (NSAttributedString.CharacterShapeAttributeName); } - set { SetNumberValue (NSAttributedString.CharacterShapeAttributeName, value); } - } - - public NSGlyphInfo GlyphInfo { - get { return Get (NSAttributedString.GlyphInfoAttributeName, handle => new NSGlyphInfo (handle)); } - set { SetNativeValue (NSAttributedString.GlyphInfoAttributeName, value); } - } - - public NSArray WritingDirection { - get { return Get (NSAttributedString.WritingDirectionAttributeName, handle => new NSArray (handle)); } - set { SetNativeValue (NSAttributedString.GlyphInfoAttributeName, value); } - } - - public bool? MarkedClauseSegment { - get { return GetBool (NSAttributedString.MarkedClauseSegmentAttributeName); } - set { Set (NSAttributedString.MarkedClauseSegmentAttributeName, value); } - } - - public NSTextLayoutOrientation? VerticalGlyphForm { - get { return (NSTextLayoutOrientation?)GetInt32Value (NSAttributedString.VerticalGlyphFormAttributeName); } - set { SetNumberValue (NSAttributedString.VerticalGlyphFormAttributeName, (int?)value); } - } - - public NSTextAlternatives TextAlternatives { - get { return Get (NSAttributedString.TextAlternativesAttributeName, handle => new NSTextAlternatives (handle)); } - set { SetNativeValue (NSAttributedString.TextAlternativesAttributeName, value); } - } - - public NSSpellingState? SpellingState { - get { return (NSSpellingState?)GetInt32Value (NSAttributedString.SpellingStateAttributeName); } - set { SetNumberValue (NSAttributedString.SpellingStateAttributeName, (int?)value); } - } -#endif } } diff --git a/src/AppKit/XEnums.cs b/src/AppKit/XEnums.cs index b1e6d09122..6fc35c4ffb 100644 --- a/src/AppKit/XEnums.cs +++ b/src/AppKit/XEnums.cs @@ -17,21 +17,6 @@ namespace AppKit { Vertical } -#if !XAMCORE_2_0 - [Flags] - [Native] - public enum NSTableViewAnimationOptions : ulong { - EffectFade = 0x1, - EffectGap = 0x2, - - // these cannot be combined - SlideUp = 0x10, - SlideDown = 0x20, - SlideLeft = 0x30, - SlideRight = 0x40, - } -#endif - [Native] public enum NSPrintRenderingQuality : long { Best, diff --git a/src/appkit.cs b/src/appkit.cs index 91ccdd4d60..1ce85898bc 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -334,12 +334,10 @@ namespace AppKit { [Export ("beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:")] void BeginSheet ([NullAllowed] NSWindow window, [NullAllowed] NSObject modalDelegate, [NullAllowed] Selector didEndSelector, IntPtr contextInfo); -#if XAMCORE_2_0 // This conflicts with a BeginSheet override in src/AppKit/NSAlert.cs and requires a cast if you pass in delegate {}. [Mac (10,9)] [Export ("beginSheetModalForWindow:completionHandler:")] [Async] void BeginSheet ([NullAllowed]NSWindow Window, [NullAllowed] Action handler); -#endif [Export ("window")] NSPanel Window { get; } @@ -607,13 +605,6 @@ namespace AppKit { [Export ("updateWindows")] void UpdateWindows (); -#if !XAMCORE_2_0 - [Export ("setMainMenu:")] - [Obsolete ("Use 'MainMenu' property.")] - [Sealed] - void SetMainMenu (NSMenu aMenu); -#endif - [Export ("mainMenu", ArgumentSemantic.Retain)] NSMenu MainMenu { get; set; } @@ -984,7 +975,6 @@ namespace AppKit { [Export ("application:didDecodeRestorableState:"), EventArgs ("NSCoder")] void DecodedRestorableState (NSApplication app, NSCoder state); -#if XAMCORE_2_0 [Mac (10,10)] [Export ("application:willContinueUserActivityWithType:"), DelegateName ("NSApplicationUserActivityType"), DefaultValue (false)] bool WillContinueUserActivity (NSApplication application, string userActivityType); @@ -992,13 +982,11 @@ namespace AppKit { [Mac (10,10)] [Export ("application:continueUserActivity:restorationHandler:"), DelegateName ("NSApplicationContinueUserActivity"), DefaultValue (false)] bool ContinueUserActivity (NSApplication application, NSUserActivity userActivity, ContinueUserActivityRestorationHandler restorationHandler); -#endif [Mac (10,10)] [Export ("application:didFailToContinueUserActivityWithType:error:"), EventArgs ("NSApplicationFailed"), DefaultValue (false)] void FailedToContinueUserActivity (NSApplication application, string userActivityType, NSError error); -#if XAMCORE_2_0 [Mac (10,10)] [Export ("application:didUpdateUserActivity:"), EventArgs ("NSApplicationUpdatedUserActivity"), DefaultValue (false)] void UpdatedUserActivity (NSApplication application, NSUserActivity userActivity); @@ -1006,7 +994,6 @@ namespace AppKit { [Mac (10,12)] [Export ("application:userDidAcceptCloudKitShareWithMetadata:"), EventArgs ("NSApplicationUserAcceptedCloudKitShare")] void UserDidAcceptCloudKitShare (NSApplication application, CKShareMetadata metadata); -#endif [Mac (10,13), EventArgs ("NSApplicationOpenUrls")] [Export ("application:openURLs:")] @@ -1764,13 +1751,6 @@ namespace AppKit { [Export ("columnContentWidthForColumnWidth:")] nfloat ColumnContentWidthForColumnWidth (nfloat columnWidth); -#if !XAMCORE_2_0 - [Export ("setColumnResizingType:")] - [Obsolete ("Use the 'ColumnResizingType' property instead.")] - [Sealed] - void SetColumnResizingType (NSBrowserColumnResizingType columnResizingType); -#endif - [Export ("columnResizingType")] NSBrowserColumnResizingType ColumnResizingType { get; set; } @@ -1971,11 +1951,7 @@ namespace AppKit { //NSImage DraggingImageForRowsWithIndexes (NSBrowser browser, NSIndexSet rowIndexes, int column, NSEvent theEvent, NSPointPointer dragImageOffset); [Export ("browser:validateDrop:proposedRow:column:dropOperation:")] -#if !XAMCORE_2_0 - NSDragOperation ValidateDrop (NSBrowser browser, [Protocolize (4)] NSDraggingInfo info, ref nint row, ref nint column, NSBrowserDropOperation dropOperation); -#else NSDragOperation ValidateDrop (NSBrowser browser, [Protocolize (4)] NSDraggingInfo info, ref nint row, ref nint column, ref NSBrowserDropOperation dropOperation); -#endif [Export ("browser:acceptDrop:atRow:column:dropOperation:")] bool AcceptDrop (NSBrowser browser, [Protocolize (4)] NSDraggingInfo info, nint row, nint column, NSBrowserDropOperation dropOperation); @@ -2079,13 +2055,6 @@ namespace AppKit { [Export ("showsStateBy")] nint ShowsStateBy { get; set; } -#if !XAMCORE_2_0 - [Export ("setShowsStateBy:")] - [Obsolete ("Use the 'ShowsStateBy' property instead.")] - [Sealed] - void SetShowsStateBy (nint aType); -#endif - [Export ("setButtonType:")] void SetButtonType (NSButtonType aType); @@ -2271,14 +2240,7 @@ namespace AppKit { void SetNextState (); [Export ("showsBorderOnlyWhileMouseInside")] -#if XAMCORE_2_0 bool ShowsBorderOnlyWhileMouseInside { get; set; } -#else - bool ShowsBorderOnlyWhileMouseInside (); - - [Export ("setShowsBorderOnlyWhileMouseInside:")] - void SetShowsBorderOnlyWhileMouseInside (bool showsBorder); -#endif [Export ("sound")] NSSound Sound { get; set; } @@ -3077,11 +3039,7 @@ namespace AppKit { //NSImage DraggingImageForItems (NSCollectionView collectionView, NSIndexSet indexes, NSEvent evg, NSPointPointer dragImageOffset); [Export ("collectionView:validateDrop:proposedIndex:dropOperation:")] -#if !XAMCORE_2_0 - NSDragOperation ValidateDrop (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo, ref nint dropIndex, NSCollectionViewDropOperation dropOperation); -#else NSDragOperation ValidateDrop (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo, ref nint dropIndex, ref NSCollectionViewDropOperation dropOperation); -#endif [Export ("collectionView:acceptDrop:index:dropOperation:")] bool AcceptDrop (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo, nint index, NSCollectionViewDropOperation dropOperation); @@ -4845,13 +4803,9 @@ namespace AppKit { [Export ("baseWritingDirection")] NSWritingDirection BaseWritingDirection { get; set; } -#if XAMCORE_2_0 [Export ("integerValue")] nint NIntValue { get; set; } -#else - [Export ("integerValue")] - nint IntegerValue { get; set; } -#endif + [Export ("performClick:")] void PerformClick (NSObject sender); @@ -5681,13 +5635,6 @@ namespace AppKit { [Export ("willNotPresentError:")] void WillNotPresentError (NSError error); -#if !XAMCORE_2_0 - [Export ("setDisplayName:")] - [Obsolete ("Use the 'DisplayName' property instead.")] - [Sealed] - void SetDisplayName ([NullAllowed] string displayNameOrNull); -#endif - [Export ("restoreDocumentWindowWithIdentifier:state:completionHandler:")] void RestoreDocumentWindow (string identifier, NSCoder state, NSWindowCompletionHandler completionHandler); @@ -5708,7 +5655,6 @@ namespace AppKit { [Export ("restorableStateKeyPaths", ArgumentSemantic.Copy)] string [] RestorableStateKeyPaths (); -#if XAMCORE_2_0 [Mac (10,10)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] [Export ("userActivity", ArgumentSemantic.Strong)] @@ -5722,7 +5668,6 @@ namespace AppKit { [Mac (10,10)] [Export ("restoreUserActivityState:")] void RestoreUserActivityState (NSUserActivity userActivity); -#endif [Mac (10,12)] [Export ("isBrowsingVersions")] @@ -7916,11 +7861,9 @@ namespace AppKit { [Export ("rotateWithEvent:")] void Rotate (NSEvent rotateEvent); -#if XAMCORE_2_0 [Mac (10,10,3)] [Export ("pressureChangeWithEvent:")] void PressureChange (NSEvent pressureChangeEvent); -#endif [Mac (10,11)] [Export ("pressureConfiguration", ArgumentSemantic.Strong)] @@ -8531,13 +8474,6 @@ namespace AppKit { [Export ("removeObject:")] void RemoveObject (NSObject object1); -#if !XAMCORE_2_0 - [Export ("setEditable:")] - [Obsolete ("Use the 'Editable' property instead.")] - [Sealed] - void SetEditable (bool editable); -#endif - [Export ("editable")] bool Editable { [Bind ("isEditable")] get; set; } @@ -9350,14 +9286,6 @@ namespace AppKit { [Export ("template")] bool Template { [Bind ("isTemplate")]get; set; } -#if !XAMCORE_2_0 - [Bind ("sizeWithAttributes:")] - CGSize StringSize ([Target] string str, NSDictionary attributes); - - [Bind ("drawInRect:withAttributes:")] - void DrawInRect ([Target] string str, CGRect rect, NSDictionary attributes); -#endif - [Export ("drawInRect:fromRect:operation:fraction:")] [Sealed] void DrawInRect (CGRect dstRect, CGRect srcRect, NSCompositingOperation operation, nfloat delta); @@ -10558,7 +10486,6 @@ namespace AppKit { } #endif -#if XAMCORE_2_0 // NSLayoutAnchor is a generic type, which we only support in Unified (for now) [Mac (10,11)] [BaseType (typeof(NSObject))] [DisableDefaultCtor] // Handle is nil @@ -10652,7 +10579,6 @@ namespace AppKit { [Export ("constraintLessThanOrEqualToAnchor:multiplier:constant:")] NSLayoutConstraint ConstraintLessThanOrEqualToAnchor (NSLayoutDimension anchor, nfloat multiplier, nfloat constant); } -#endif // XAMCORE_2_0 [BaseType (typeof (NSObject))] interface NSLayoutConstraint : NSAnimatablePropertyContainer { @@ -10703,7 +10629,6 @@ namespace AppKit { [Static, Export ("deactivateConstraints:")] void DeactivateConstraints (NSLayoutConstraint [] constraints); -#if XAMCORE_2_0 [Mac (10, 12)] [Export ("firstAnchor", ArgumentSemantic.Copy)] NSLayoutAnchor FirstAnchor { get; } @@ -10711,7 +10636,6 @@ namespace AppKit { [Mac (10, 12)] [NullAllowed, Export ("secondAnchor", ArgumentSemantic.Copy)] NSLayoutAnchor SecondAnchor { get; } -#endif [NullAllowed, Export ("identifier")] string Identifier { get; set; } @@ -10727,7 +10651,6 @@ namespace AppKit { [NullAllowed, Export ("owningView", ArgumentSemantic.Weak)] NSView OwningView { get; set; } -#if XAMCORE_2_0 // NSLayoutXAxisAnchor is a generic type, only supported in Unified (for now) [Export ("leadingAnchor", ArgumentSemantic.Strong)] NSLayoutXAxisAnchor LeadingAnchor { get; } @@ -10757,7 +10680,6 @@ namespace AppKit { [Export ("centerYAnchor", ArgumentSemantic.Strong)] NSLayoutYAxisAnchor CenterYAnchor { get; } -#endif // XAMCORE_2_0 [Mac (10, 12)] [Export ("hasAmbiguousLayout")] @@ -10781,31 +10703,7 @@ namespace AppKit { [Model] [BaseType (typeof (NSObject))] [Protocol] -#if XAMCORE_2_0 interface NSMatrixDelegate : NSControlTextEditingDelegate { -#else - interface NSMatrixDelegate { - [Export ("control:textShouldBeginEditing:"), DelegateName ("NSControlText"), DefaultValue (true)] - bool TextShouldBeginEditing (NSControl control, NSText fieldEditor); - - [Export ("control:textShouldEndEditing:"), DelegateName ("NSControlText"), DefaultValue (true)] - bool TextShouldEndEditing (NSControl control, NSText fieldEditor); - - [Export ("control:didFailToFormatString:errorDescription:"), DelegateName ("NSControlTextError"), DefaultValue (true)] - bool DidFailToFormatString (NSControl control, string str, string error); - - [Export ("control:didFailToValidatePartialString:errorDescription:"), EventArgs ("NSControlTextError")] - void DidFailToValidatePartialString (NSControl control, string str, string error); - - [Export ("control:isValidObject:"), DelegateName ("NSControlTextValidation"), DefaultValue (true)] - bool IsValidObject (NSControl control, NSObject objectToValidate); - - [Export ("control:textView:doCommandBySelector:"), DelegateName ("NSControlCommand"), DefaultValue (false)] - bool DoCommandBySelector (NSControl control, NSTextView textView, Selector commandSelector); - - [Export ("control:textView:completions:forPartialWordRange:indexOfSelectedItem:"), DelegateName ("NSControlTextCompletion"), DefaultValue (null)] - string [] GetCompletions (NSControl control, NSTextView textView, string [] words, NSRange charRange, ref nint index); -#endif } [Model] @@ -11606,33 +11504,18 @@ namespace AppKit { [Model] [Protocol] interface NSPathControlDelegate { - #if !XAMCORE_2_0 - [Abstract] - #endif [Export ("pathControl:shouldDragPathComponentCell:withPasteboard:")] bool ShouldDragPathComponentCell (NSPathControl pathControl, NSPathComponentCell pathComponentCell, NSPasteboard pasteboard); - #if !XAMCORE_2_0 - [Abstract] - #endif [Export ("pathControl:validateDrop:")] NSDragOperation ValidateDrop (NSPathControl pathControl, [Protocolize (4)] NSDraggingInfo info); - #if !XAMCORE_2_0 - [Abstract] - #endif [Export ("pathControl:acceptDrop:")] bool AcceptDrop (NSPathControl pathControl, [Protocolize (4)] NSDraggingInfo info); -#if !XAMCORE_2_0 - [Abstract] -#endif [Export ("pathControl:willDisplayOpenPanel:")] void WillDisplayOpenPanel (NSPathControl pathControl, NSOpenPanel openPanel); -#if !XAMCORE_2_0 - [Abstract] -#endif [Export ("pathControl:willPopUpMenu:")] void WillPopUpMenu (NSPathControl pathControl, NSMenu menu); @@ -12663,12 +12546,7 @@ namespace AppKit { bool PerformKeyEquivalent (NSEvent theEvent); [Export ("validRequestorForSendType:returnType:")] -#if XAMCORE_2_0 NSObject ValidRequestorForSendType ([NullAllowed] string sendType, [NullAllowed] string returnType); -#else - [Obsolete ("Use 'ValidRequestorForSendType' instead.")] - NSObject ValidRequestorForSendTypereturnType (string sendType, string returnType); -#endif [Export ("mouseDown:")] void MouseDown (NSEvent theEvent); @@ -12806,7 +12684,6 @@ namespace AppKit { [Export ("wantsForwardedScrollEventsForAxis:")] bool WantsForwardedScrollEventsForAxis (NSEventGestureAxis axis); -#if XAMCORE_2_0 [Mac (10,10)] [DebuggerBrowsable(DebuggerBrowsableState.Never)] [Export ("userActivity", ArgumentSemantic.Strong)] @@ -12824,7 +12701,6 @@ namespace AppKit { [Mac (10,10,3)] [Export ("pressureChangeWithEvent:")] void PressureChange (NSEvent pressureChangeEvent); -#endif [Mac (10,12)] [Export ("newWindowForTab:")] @@ -14564,11 +14440,7 @@ namespace AppKit { void RemoveArrangedSubview (NSView view); [Export ("holdingPriorityForSubviewAtIndex:")] - #if XAMCORE_2_0 float /*NSLayoutPriority*/ HoldingPriorityForSubview (nint subviewIndex); -#else - float /*NSLayoutPriority*/ HoldingPriorityForSubviewAtIndex (nint subviewIndex); - #endif [Export ("setHoldingPriority:forSubviewAtIndex:")] void SetHoldingPriority (float /*NSLayoutPriority*/ priority, nint subviewIndex); @@ -16261,7 +16133,6 @@ namespace AppKit { // NSConstraintBasedLayoutCoreMethods -#if XAMCORE_2_0 // NSLayoutXAxisAnchor is a generic type, only supported in Unified (for now) [Mac (10,11)] [Export ("leadingAnchor", ArgumentSemantic.Strong)] NSLayoutXAxisAnchor LeadingAnchor { get; } @@ -16309,7 +16180,6 @@ namespace AppKit { [Mac (10,11)] [Export ("lastBaselineAnchor", ArgumentSemantic.Strong)] NSLayoutYAxisAnchor LastBaselineAnchor { get; } -#endif // XAMCORE_2_0 [Mac (10,11)] [Export ("firstBaselineOffsetFromTop")] @@ -16405,10 +16275,7 @@ namespace AppKit { } [BaseType (typeof (NSResponder))] - interface NSViewController : NSResponder, NSUserInterfaceItemIdentification, NSEditor, NSSeguePerforming -#if XAMCORE_2_0 - , NSExtensionRequestHandling -#endif + interface NSViewController : NSResponder, NSUserInterfaceItemIdentification, NSEditor, NSSeguePerforming , NSExtensionRequestHandling { [DesignatedInitializer] [Export ("initWithNibName:bundle:")] @@ -16545,7 +16412,6 @@ namespace AppKit { [Export ("storyboard", ArgumentSemantic.Strong)] NSStoryboard Storyboard { get; } -#if XAMCORE_2_0 [Mac (10,10)] [Export ("presentViewControllerInWidget:")] void PresentViewControllerInWidget (NSViewController viewController); @@ -16569,7 +16435,6 @@ namespace AppKit { [Mac (10, 10)] [Export ("preferredMaximumSize")] CGSize PreferredMaximumSize { get; } -#endif } [Mac (10,10)] @@ -16684,12 +16549,6 @@ namespace AppKit { [Export ("initWithIdentifier:")] IntPtr Constructor (NSString identifier); -#if !XAMCORE_2_0 - [Obsolete, Export ("initWithIdentifier:")] - [Sealed] - IntPtr Constructor (NSObject identifier); -#endif - [Availability (Deprecated = Platform.Mac_10_10)] [Export ("dataCellForRow:")] NSCell DataCellForRow (nint row); @@ -17330,11 +17189,7 @@ namespace AppKit { string [] FilesDropped (NSTableView tableView, NSUrl dropDestination, NSIndexSet indexSet ); [Export ("tableView:pasteboardWriterForRow:")] -#if XAMCORE_2_0 INSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, nint row); -#else - NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, nint row); -#endif [Export ("tableView:draggingSession:willBeginAtPoint:forRowIndexes:")] void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, CGPoint willBeginAtScreenPoint, NSIndexSet rowIndexes); @@ -17468,11 +17323,7 @@ namespace AppKit { void DidRemoveRowView (NSTableView tableView, NSTableRowView rowView, nint row); [Export ("tableView:pasteboardWriterForRow:")] -#if XAMCORE_2_0 INSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, nint row); -#else - NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, nint row); -#endif [Export ("tableView:draggingSession:willBeginAtPoint:forRowIndexes:")] void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, CGPoint willBeginAtScreenPoint, NSIndexSet rowIndexes); @@ -19626,15 +19477,12 @@ namespace AppKit { } [BaseType (typeof (NSObject), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSToolbarDelegate)})] -#if XAMCORE_2_0 [DisableDefaultCtor] // init was added in 10.13 -#endif partial interface NSToolbar { -#if XAMCORE_2_0 [Mac (10, 13)] [Export ("init")] IntPtr Constructor (); -#endif + [DesignatedInitializer] [Export ("initWithIdentifier:")] IntPtr Constructor (string identifier); @@ -21303,11 +21151,7 @@ namespace AppKit { void WillMove (NSNotification notification); [Export ("windowDidMove:"), EventArgs ("NSNotification")] -#if XAMCORE_2_0 void DidMove (NSNotification notification); -#else - void DidMoved (NSNotification notification); -#endif [Export ("windowDidBecomeKey:"), EventArgs ("NSNotification")] void DidBecomeKey (NSNotification notification); @@ -22033,11 +21877,7 @@ namespace AppKit { //Detected properties [Export ("delegate", ArgumentSemantic.Assign), NullAllowed] -#if XAMCORE_2_0 NSObject WeakDelegate { get; set; } -#else - NSRuleEditorDelegate WeakDelegate { get; set; } -#endif [Wrap ("WeakDelegate")] [Protocolize] @@ -22350,11 +22190,7 @@ namespace AppKit { NSSharingService [] SharingServicesForItems (NSSharingServicePicker sharingServicePicker, NSObject [] items, NSSharingService [] proposedServices); [Export ("sharingServicePicker:delegateForSharingService:"), DelegateName ("NSSharingServicePickerDelegateForSharingService"), DefaultValue (null)] -#if XAMCORE_2_0 INSSharingServiceDelegate DelegateForSharingService (NSSharingServicePicker sharingServicePicker, NSSharingService sharingService); -#else - NSSharingServiceDelegate DelegateForSharingService (NSSharingServicePicker sharingServicePicker, NSSharingService sharingService); -#endif [Export ("sharingServicePicker:didChooseSharingService:"), EventArgs ("NSSharingServicePickerDidChooseSharingService")] void DidChooseSharingService (NSSharingServicePicker sharingServicePicker, NSSharingService service); @@ -22558,11 +22394,7 @@ namespace AppKit { partial interface NSCollectionViewDelegate { [Export ("collectionView:pasteboardWriterForItemAtIndex:")] -#if XAMCORE_2_0 INSPasteboardWriting PasteboardWriterForItem (NSCollectionView collectionView, nuint index); -#else - NSPasteboardWriting PasteboardWriterForItemAtIndex (NSCollectionView collectionView, nuint index); -#endif [Export ("collectionView:updateDraggingItemsForDrag:")] void UpdateDraggingItemsForDrag (NSCollectionView collectionView, [Protocolize (4)] NSDraggingInfo draggingInfo); @@ -22592,14 +22424,6 @@ namespace AppKit { NSDocument DuplicateDocumentWithContentsOfUrl (NSUrl url, bool duplicateByCopying, [NullAllowed] string displayName, out NSError error); -#if !XAMCORE_2_0 - [Export ("openDocumentWithContentsOfURL:display:completionHandler:")] - [Obsolete ("Use 'OpenDocument' instead.")] - [Sealed] - void OpenDocumentWithContentsOfUrl (NSUrl url, bool displayDocument, - OpenDocumentCompletionHandler completionHandler); -#endif - [Export ("reopenDocumentForURL:withContentsOfURL:display:completionHandler:")] void ReopenDocumentForUrl ([NullAllowed] NSUrl url, NSUrl contentsUrl, bool displayDocument, OpenDocumentCompletionHandler completionHandler); @@ -22679,23 +22503,6 @@ namespace AppKit { [Export ("moveItemAtIndex:inParent:toIndex:inParent:")] void MoveItem (nint fromIndex, [NullAllowed] NSObject oldParent, nint toIndex, [NullAllowed] NSObject newParent); -#if !XAMCORE_2_0 - // - (void)insertItemsAtIndexes:(NSIndexSet *)indexes inParent:(id)parent withAnimation:(NSTableViewAnimationOptions)animationOptions NS_AVAILABLE_MAC(10_7); - [Export ("insertItemsAtIndexes:inParent:withAnimation:")] - void InsertItems (NSIndexSet indexes, [NullAllowed] NSObject parent, NSTableViewAnimationOptions animationOptions); - - // - (void)removeItemsAtIndexes:(NSIndexSet *)indexes inParent:(id)parent withAnimation:(NSTableViewAnimationOptions)animationOptions NS_AVAILABLE_MAC(10_7); - [Export ("removeItemsAtIndexes:inParent:withAnimation:")] - void RemoveItems (NSIndexSet indexes, [NullAllowed] NSObject parent, NSTableViewAnimationOptions animationOptions); - - // - (void)insertRowsAtIndexes:(NSIndexSet *)indexes withAnimation:(NSTableViewAnimationOptions)animationOptions UNAVAILABLE_ATTRIBUTE; - [Export ("insertRowsAtIndexes:withAnimation:")] - void InsertRows (NSIndexSet indexes, NSTableViewAnimationOptions animationOptions); - - // - (void)removeRowsAtIndexes:(NSIndexSet *)indexes withAnimation:(NSTableViewAnimationOptions)animationOptions UNAVAILABLE_ATTRIBUTE; - [Export ("removeRowsAtIndexes:withAnimation:")] - void RemoveRows (NSIndexSet indexes, NSTableViewAnimationOptions animationOptions); -#else [Export ("insertItemsAtIndexes:inParent:withAnimation:")] void InsertItems (NSIndexSet indexes, [NullAllowed] NSObject parent, NSTableViewAnimation animationOptions); @@ -22707,7 +22514,6 @@ namespace AppKit { [Export ("removeRowsAtIndexes:withAnimation:")] void RemoveRows (NSIndexSet indexes, NSTableViewAnimation animationOptions); -#endif // - (void)moveRowAtIndex:(NSInteger)oldIndex toIndex:(NSInteger)newIndex UNAVAILABLE_ATTRIBUTE; [Export ("moveRowAtIndex:toIndex:")] @@ -22717,11 +22523,7 @@ namespace AppKit { partial interface NSOutlineViewDataSource { // - (id )outlineView:(NSOutlineView *)outlineView pasteboardWriterForItem:(id)item NS_AVAILABLE_MAC(10_7); [Export ("outlineView:pasteboardWriterForItem:")] -#if XAMCORE_2_0 INSPasteboardWriting PasteboardWriterForItem (NSOutlineView outlineView, NSObject item); -#else - NSPasteboardWriting PasteboardWriterForItem (NSOutlineView outlineView, NSObject item); -#endif // - (void)outlineView:(NSOutlineView *)outlineView draggingSession:(NSDraggingSession *)session willBeginAtPoint:(NSPoint)screenPoint forItems:(NSArray *)draggedItems NS_AVAILABLE_MAC(10_7); [Export ("outlineView:draggingSession:willBeginAtPoint:forItems:")] @@ -23308,11 +23110,7 @@ namespace AppKit { partial interface NSImage { [Static, Export ("imageWithSize:flipped:drawingHandler:")] -#if XAMCORE_2_0 NSImage ImageWithSize (CGSize size, bool flipped, NSCustomImageRepDrawingHandler drawingHandler); -#else - NSObject ImageWithSize (CGSize size, bool flipped, NSCustomImageRepDrawingHandler drawingHandler); -#endif } partial interface NSSplitViewDividerIndexEventArgs { @@ -25925,7 +25723,6 @@ namespace AppKit { nint Tag { get; } } -#if XAMCORE_2_0 [Protocol] [Mac (10,12)] interface NSCloudSharingValidation @@ -25935,7 +25732,6 @@ namespace AppKit { [return: NullAllowed] CKShare GetCloudShare (INSValidatedUserInterfaceItem item); } -#endif [Deprecated (PlatformName.MacOSX, 10, 14, message : "Use 'Metal' Framework instead.")] [BaseType (typeof(CAOpenGLLayer))] diff --git a/src/frameworks.sources b/src/frameworks.sources index f59bf574f4..ad7a5bfbc3 100644 --- a/src/frameworks.sources +++ b/src/frameworks.sources @@ -82,9 +82,7 @@ APPKIT_SOURCES = \ AppKit/Functions.cs \ AppKit/NSActionCell.cs \ AppKit/NSAlert.cs \ - AppKit/NSAppleEventManager.cs \ AppKit/NSApplication.cs \ - AppKit/NSApplicationDelegate.cs \ AppKit/NSArrayController.cs \ AppKit/NSBezierPath.cs \ AppKit/NSBitmapImageRep.cs \ @@ -93,7 +91,6 @@ APPKIT_SOURCES = \ AppKit/NSCell.cs \ AppKit/NSColor.cs \ AppKit/NSComboBox.cs \ - AppKit/NSComboBoxCell.cs \ AppKit/NSControl.cs \ AppKit/NSDraggingInfo.cs \ AppKit/NSDraggingSession.cs \ @@ -120,7 +117,6 @@ APPKIT_SOURCES = \ AppKit/NSPopUpButtonCell.cs \ AppKit/NSPredicateEditorRowTemplate.cs \ AppKit/NSPrintInfo.cs \ - AppKit/NSResponder.cs \ AppKit/NSScreen.cs \ AppKit/NSSegmentedControl.cs \ AppKit/NSSharingService.cs \