diff --git a/.gitignore b/.gitignore index 4c43bd053..e8defe480 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ *.mdb *.dll src/generated_sources + +src/.DS_Store diff --git a/src/AppKit/Defs.cs b/src/AppKit/Defs.cs index 4def6f833..3f01edd0a 100644 --- a/src/AppKit/Defs.cs +++ b/src/AppKit/Defs.cs @@ -25,7 +25,11 @@ namespace MonoMac.AppKit { [StructLayout (LayoutKind.Sequential)] public struct NSEdgeInsets { +#if MAC64 + public double Top, Left, Bottom, Right; +#else public float Top, Left, Bottom, Right; +#endif public NSEdgeInsets (float top, float left, float bottom, float right) { diff --git a/src/AppKit/Enums.cs b/src/AppKit/Enums.cs index feb01c55e..5cb41b27a 100755 --- a/src/AppKit/Enums.cs +++ b/src/AppKit/Enums.cs @@ -24,280 +24,108 @@ using System; using MonoMac.ObjCRuntime; -namespace MonoMac.AppKit { - - public enum NSRunResponse { - Stopped = -1000, - Aborted = -1001, - Continues = -1002 - } - - public enum NSApplicationActivationOptions { - ActivateAllWindows = 1, - ActivateIgnoringOtherWindows = 2 - } - - public enum NSApplicationActivationPolicy { - Regular, Accessory, Prohibited - } - - public enum NSApplicationPresentationOptions { - Default = 0, - AutoHideDock = (1 << 0), - HideDock = (1 << 1), - - AutoHideMenuBar = (1 << 2), - HideMenuBar = (1 << 3), - - DisableAppleMenu = (1 << 4), - DisableProcessSwitching = (1 << 5), - DisableForceQuit = (1 << 6), - DisableSessionTermination = (1 << 7), - DisableHideApplication = (1 << 8), - DisableMenuBarTransparency = (1 << 9), - - FullScreen = (1 << 10), - AutoHideToolbar = (1 << 11) - } - - public enum NSApplicationDelegateReply { - Success, - Cancel, - Failure - } +#if !MAC64 +#error this file is specifically for a 64 bit build +#endif - public enum NSRequestUserAttentionType { - CriticalRequest = 0, - InformationalRequest = 10 - } - - public enum NSApplicationTerminateReply { - Cancel, Now, Later - } - - public enum NSApplicationPrintReply { - Cancelled, Success, Failure, ReplyLater - } - - public enum NSApplicationLayoutDirection { - LeftToRight = 0, - RightToLeft = 1 - } - - public enum NSImageInterpolation { - Default, None, Low, Medium, High - } - - public enum NSComposite { - Clear, - Copy, - SourceOver, - SourceIn, - SourceOut, - SourceAtop, - DestinationOver, - DestinationIn, - DestinationOut, - DestinationAtop, - XOR, - PlusDarker, - Highlight, - PlusLighter, - } - - public enum NSBackingStore { - Retained, Nonretained, Buffered - } - - public enum NSWindowOrderingMode { - Below = -1, Out, Above, - } - - public enum NSFocusRingPlacement { - RingOnly, RingBelow, RingAbove, - } - - public enum NSFocusRingType { - Default, None, Exterior - } - - public enum NSColorRenderingIntent { - Default, - AbsoluteColorimetric, - RelativeColorimetric, - Perceptual, - Saturation - - } - - public enum NSRectEdge { - MinXEdge, MinYEdge, MaxXEdge, MaxYEdge - } - - public enum NSUserInterfaceLayoutDirection { - LeftToRight, RightToLeft - } - -#region NSColorSpace - public enum NSColorSpaceModel { - Unknown = -1, - Gray, - RGB, - CMYK, - LAB, - DeviceN, - Indexed, - Pattern - } -#endregion - -#region NSFileWrapper - [Flags] - public enum NSFileWrapperReadingOptions { - Immediate = 1, WithoutMapping = 2 - } -#endregion +namespace MonoMac.AppKit { + /* + public enum : ulong { // NSUInteger + NSTextReadInapplicableDocumentTypeError = 65806, + NSTextWriteInapplicableDocumentTypeError = 66062, + NSTextReadWriteErrorMinimum = 65792, + NSTextReadWriteErrorMaximum = 66303, + NSServiceApplicationNotFoundError = 66560, + NSServiceApplicationLaunchFailedError = 66561, + NSServiceRequestTimedOutError = 66562, + NSServiceInvalidPasteboardDataError = 66563, + NSServiceMalformedServiceDictionaryError = 66564, + NSServiceMiscellaneousError = 66800, + NSServiceErrorMinimum = 66560, + NSServiceErrorMaximum = 66817 + }*/ -#region NSParagraphStyle - public enum NSTextTabType { - Left, Right, Center, Decimal + public enum NSCompositingOperation : ulong { // NSUInteger + Clear = 0, + Copy = 1, + SourceOver = 2, + SourceIn = 3, + SourceOut = 4, + SourceAtop = 5, + DestinationOver = 6, + DestinationIn = 7, + DestinationOut = 8, + DestinationAtop = 9, + XOR = 10, + PlusDarker = 11, + Highlight = 12, + PlusLighter = 13 } - public enum NSLineBreakMode { - ByWordWrapping, - CharWrapping, - Clipping, - TruncatingHead, - TruncatingTail, - TruncatingMiddle - } -#endregion - -#region NSCell Defines - - public enum NSType { - Any = 0, - Int = 1, - PositiveInt = 2, - Float = 3, - PositiveFloat = 4, - Double = 6, - PositiveDouble = 7 - } - - public enum NSCellType { - Null, - Text, - Image - } - - public enum NSCellAttribute { - CellDisabled, - CellState, - PushInCell, - CellEditable, - ChangeGrayCell, - CellHighlighted, - CellLightsByContents, - CellLightsByGray, - ChangeBackgroundCell, - CellLightsByBackground, - CellIsBordered, - CellHasOverlappingImage, - CellHasImageHorizontal, - CellHasImageOnLeftOrBottom, - CellChangesContents, - CellIsInsetButton, - CellAllowsMixedState, - } - - public enum NSCellImagePosition { - NoImage, - ImageOnly, - ImageLeft, - ImageRight, - ImageBelow, - ImageAbove, - ImageOverlaps, + public enum NSBackingStoreType : ulong { // NSUInteger + Retained = 0, + Nonretained = 1, + Buffered = 2 } - public enum NSImageScale { - ProportionallyDown = 0, - AxesIndependently, - None, - ProportionallyUpOrDown + public enum NSWindowOrderingMode : long { // NSInteger + Above = 1, + Below = -1, + Out = 0 } - public enum NSCellStateValue { - Mixed = -1, - Off, - On + public enum NSFocusRingPlacement : ulong { // NSUInteger + RingOnly = 0, + RingBelow = 1, + RingAbove = 2 } - [Flags] - public enum NSCellMask { - NoCell = 0, - ContentsCell = 1 << 0, - PushInCell = 1 << 1, - ChangeGrayCell = 1 << 2, - ChangeBackgroundCell = 1 << 3 + public enum NSFocusRingType : ulong { //NSUInteger + Default = 0, + None = 1, + Exterior = 2 } - [Flags] - public enum NSCellHit { - None, - ContentArea = 1, - EditableTextArea = 2, - TrackableArae = 4 - } - - public enum NSControlTint : uint { - Default = 0, // system 'default' - Blue = 1, - Graphite = 6, - Clear = 7 + public enum NSColorRenderingIntent : long { // NSInteger + Default = 0, + AbsoluteColorimetric = 1, + RelativeColorimetric = 2, + Perceptual = 3, + Saturation = 4 } - public enum NSControlSize { - Regular, - Small, - Mini - } - - public enum NSBackgroundStyle { - Light, Dark, Raised, Lowered + public enum NSWindowDepth : long { // NSInteger + TwentyfourBitRGB = 520, + SixtyfourBitRGB = 528, + OnehundredtwentyeightBitRGB = 544 } -#endregion -#region NSImage - - public enum NSImageLoadStatus { - Completed, - Cancelled, - InvalidData, - UnexpectedEOF, - ReadError + public enum NSAnimationEffect : ulong { // NSUInteger + DisappearingItemDefault = 0, + Poof = 10 } - public enum NSImageCacheMode { - Default, - Always, - BySize, - Never + public enum NSImageInterpolation : ulong { // NSUInteger + Default = 0, + None = 1, + Low = 2, + Medium = 4, + High = 3 } - -#endregion - -#region NSAlert - public enum NSAlertStyle { - Warning, Informational, Critical + + public enum NSTouchPhase : ulong { // NSUInteger + NSTouchPhaseBegan = 1, + NSTouchPhaseMoved = 2, + NSTouchPhaseStationary = 4, + NSTouchPhaseEnded = 8, + NSTouchPhaseCancelled = 16, + NSTouchPhaseTouching = 7, + NSTouchPhaseAny = ulong.MaxValue } -#endregion -#region NSEvent - public enum NSEventType { - LeftMouseDown = 1, + public enum NSEventType : ulong { // NSUInteger + LeftMouseDown = 1, LeftMouseUp = 2, RightMouseDown = 3, RightMouseUp = 4, @@ -314,84 +142,103 @@ public enum NSEventType { ApplicationDefined = 15, Periodic = 16, CursorUpdate = 17, - ScrollWheel = 22, - TabletPoint = 23, TabletProximity = 24, - OtherMouseDown = 25, OtherMouseUp = 26, OtherMouseDragged = 27, - - Gesture = 29, - Magnify = 30, - Swipe = 31, - Rotate = 18, - BeginGesture = 19, - EndGesture = 20, - - SmartMagnify = 32, - QuickLook = 33 + EventTypeGesture = 29, + EventTypeMagnify = 30, + EventTypeSwipe = 31, + EventTypeRotate = 18, + EventTypeBeginGesture = 19, + EventTypeEndGesture = 20, + EventTypeSmartMagnify = 32, + EventTypeQuickLook = 33 } - - [Flags] + public enum NSEventMask : ulong { - LeftMouseDown = 1 << NSEventType.LeftMouseDown, - LeftMouseUp = 1 << NSEventType.LeftMouseUp, - RightMouseDown = 1 << NSEventType.RightMouseDown, - RightMouseUp = 1 << NSEventType.RightMouseUp, - MouseMoved = 1 << NSEventType.MouseMoved, - LeftMouseDragged = 1 << NSEventType.LeftMouseDragged, - RightMouseDragged = 1 << NSEventType.RightMouseDragged, - MouseEntered = 1 << NSEventType.MouseEntered, - MouseExited = 1 << NSEventType.MouseExited, - KeyDown = 1 << NSEventType.KeyDown, - KeyUp = 1 << NSEventType.KeyUp, - FlagsChanged = 1 << NSEventType.FlagsChanged, - AppKitDefined = 1 << NSEventType.AppKitDefined, - SystemDefined = 1 << NSEventType.SystemDefined, - ApplicationDefined = 1 << NSEventType.ApplicationDefined, - Periodic = 1 << NSEventType.Periodic, - CursorUpdate = 1 << NSEventType.CursorUpdate, - ScrollWheel = 1 << NSEventType.ScrollWheel, - TabletPoint = 1 << NSEventType.TabletPoint, - TabletProximity = 1 << NSEventType.TabletProximity, - OtherMouseDown = 1 << NSEventType.OtherMouseDown, - OtherMouseUp = 1 << NSEventType.OtherMouseUp, - OtherMouseDragged = 1 << NSEventType.OtherMouseDragged, - EventGesture = 1 << NSEventType.Gesture, - EventMagnify = (uint)1 << NSEventType.Magnify, - EventSwipe = (uint)1 << NSEventType.Swipe, - EventRotate = (uint)1 << NSEventType.Rotate, - EventBeginGesture = (uint)1 << NSEventType.BeginGesture, - EventEndGesture = (uint)1 << NSEventType.EndGesture, - AnyEvent = UInt32.MaxValue + LeftMouseDownMask = 2, + LeftMouseUpMask = 4, + RightMouseDownMask = 8, + RightMouseUpMask = 16, + MouseMovedMask = 32, + LeftMouseDraggedMask = 64, + RightMouseDraggedMask = 128, + MouseEnteredMask = 256, + MouseExitedMask = 512, + KeyDownMask = 1024, + KeyUpMask = 2048, + FlagsChangedMask = 4096, + AppKitDefinedMask = 8192, + SystemDefinedMask = 16384, + ApplicationDefinedMask = 32768, + PeriodicMask = 65536, + CursorUpdateMask = 131072, + ScrollWheelMask = 4194304, + TabletPointMask = 8388608, + TabletProximityMask = 16777216, + OtherMouseDownMask = 33554432, + OtherMouseUpMask = 67108864, + OtherMouseDraggedMask = 134217728, + EventMaskGesture = 536870912, + EventMaskMagnify = 1073741824, + EventMaskSwipe = 2147483648, + EventMaskRotate = 262144, + EventMaskBeginGesture = 524288, + EventMaskEndGesture = 1048576, + EventMaskSmartMagnify = 4294967296, + AnyEvent = ulong.MaxValue } - - [Flags] - public enum NSEventModifierMask : uint { - AlphaShiftKeyMask = 1 << 16, - ShiftKeyMask = 1 << 17, - ControlKeyMask = 1 << 18, - AlternateKeyMask = 1 << 19, - CommandKeyMask = 1 << 20, - NumericPadKeyMask = 1 << 21, - HelpKeyMask = 1 << 22, - FunctionKeyMask = 1 << 23, - DeviceIndependentModifierFlagsMask = 0xffff0000 + + public enum NSEventModifierMask : ulong { // NSUInteger + AlphaShift = 65536, + Shift = 131072, + Control = 262144, + Alternate = 524288, + Command = 1048576, + NumericPad = 2097152, + Help = 4194304, + Function = 8388608, + DeviceIndependentModifierFlags = 0xffff0000 } - - public enum NSPointingDeviceType { - Unknown, Pen, Cursor, Eraser + + public enum NSPointingDeviceType : ulong { // NSUInteger + NSUnknownPointingDevice = 0, + NSPenPointingDevice = 1, + NSCursorPointingDevice = 2, + NSEraserPointingDevice = 3 } - - [Flags] - public enum NSPointingDeviceMask { - Pen = 1, PenLower = 2, PenUpper = 4 + + public enum NSButtonMask : ulong { // NSUInteger + NSPenTipMask = 1, + NSPenLowerSideMask = 2, + NSPenUpperSideMask = 4 + } + + public enum NSEventPhase : ulong { // NSUInteger + NSEventPhaseNone = 0, + NSEventPhaseBegan = 1, + NSEventPhaseStationary = 2, + NSEventPhaseChanged = 4, + NSEventPhaseEnded = 8, + NSEventPhaseCancelled = 16, + NSEventPhaseMayBegin = 32 + } + + public enum NSEventGestureAxis : long { // NSInteger + NSEventGestureAxisNone = 0, + NSEventGestureAxisHorizontal = 1, + NSEventGestureAxisVertical = 2 + } + + public enum NSEventSwipeTrackingOptions : ulong { // NSUInteger + NSEventSwipeTrackingLockDirection = 1, + NSEventSwipeTrackingClampGestureAmount = 2 } - public enum NSKey { + public enum NSKey : ulong { // NSUInteger A = 0x00, S = 0x01, D = 0x02, @@ -548,7 +395,7 @@ public enum NSKey { ModeSwitch = 0xF747 } - public enum NSEventSubtype { + public enum NSEventSubtype : ulong { // NSUInteger WindowExposed = 0, ApplicationActivated = 1, ApplicationDeactivated = 2, @@ -557,60 +404,506 @@ public enum NSEventSubtype { AWT = 16 } - public enum NSSystemDefinedEvents { + public enum NSSystemDefinedEvents : ulong { // NSUInteger NSPowerOffEventType = 1 } +/* +public enum : ulong { // NSUInteger + NSMouseEventSubtype = 0, + NSTabletPointEventSubtype = 1, + NSTabletProximityEventSubtype = 2, + NSTouchEventSubtype = 3 +} + */ + public enum NSAnimationCurve : ulong { // NSUInteger + NSAnimationEaseInOut = 0, + NSAnimationEaseIn = 1, + NSAnimationEaseOut = 2, + NSAnimationLinear = 3 + } + + public enum NSAnimationBlockingMode : ulong { // NSUInteger + Blocking = 0, + Nonblocking = 1, + NonblockingThreaded = 2 + } - public enum NSEventMouseSubtype { - Mouse, TablePoint, TabletProximity, Touch + public enum NSDragOperation : ulong { // NSUInteger + None = 0, + Copy = 1, + Link = 2, + Generic = 4, + Private = 8, + AllObsolete = 15, + Move = 16, + Delete = 32, + Every = ulong.MaxValue + } + + public enum NSDraggingFormation : long { // NSInteger + NSDraggingFormationDefault = 0, + NSDraggingFormationNone = 1, + NSDraggingFormationPile = 2, + NSDraggingFormationList = 3, + NSDraggingFormationStack = 4 + } + + public enum NSDraggingContext : long { // NSInteger + NSDraggingContextOutsideApplication = 0, + NSDraggingContextWithinApplication = 1 + } + + public enum NSDraggingItemEnumerationOptions : ulong { // NSUInteger + NSDraggingItemEnumerationConcurrent = 1, + NSDraggingItemEnumerationClearNonenumeratedImages = 65536 + } + + [Flags] + public enum NSViewResizingMask : ulong { // NSUInteger + NotSizable = 0, + MinXMargin = 1, + WidthSizable = 2, + MaxXMargin = 4, + MinYMargin = 8, + HeightSizable = 16, + MaxYMargin = 32 + } + + public enum NSBorderType : ulong { // NSUInteger + NoBorder = 0, + LineBorder = 1, + BezelBorder = 2, + GrooveBorder = 3 + } + + public enum NSViewLayerContentsRedrawPolicy : long { // NSInteger + NSViewLayerContentsRedrawNever = 0, + NSViewLayerContentsRedrawOnSetNeedsDisplay = 1, + NSViewLayerContentsRedrawDuringViewResize = 2, + NSViewLayerContentsRedrawBeforeViewResize = 3 + } + + public enum NSViewLayerContentsPlacement : long { // NSInteger + NSViewLayerContentsPlacementScaleAxesIndependently = 0, + NSViewLayerContentsPlacementScaleProportionallyToFit = 1, + NSViewLayerContentsPlacementScaleProportionallyToFill = 2, + NSViewLayerContentsPlacementCenter = 3, + NSViewLayerContentsPlacementTop = 4, + NSViewLayerContentsPlacementTopRight = 5, + NSViewLayerContentsPlacementRight = 6, + NSViewLayerContentsPlacementBottomRight = 7, + NSViewLayerContentsPlacementBottom = 8, + NSViewLayerContentsPlacementBottomLeft = 9, + NSViewLayerContentsPlacementLeft = 10, + NSViewLayerContentsPlacementTopLeft = 11 + } + +/* + public enum : ulong { // NSUInteger + NSEnterCharacter = 3, + NSBackspaceCharacter = 8, + NSTabCharacter = 9, + NSNewlineCharacter = 10, + NSFormFeedCharacter = 12, + NSCarriageReturnCharacter = 13, + NSBackTabCharacter = 25, + NSDeleteCharacter = 127, + NSLineSeparatorCharacter = 8232, + NSParagraphSeparatorCharacter = 8233 + } + */ + public enum NSTextAlignment : ulong { // NSUInteger + Left = 0, + Right = 1, + Center = 2, + Justified = 3, + Natural = 4 + } + + public enum NSWritingDirection : long { // NSInteger + Natural = -1, + LeftToRight = 0, + RightToLeft = 1, + + Embedding = 0, + Override = 2 + } + /* + public enum NSWritingDirection : ulong { // NSUInteger + NSTextWritingDirectionEmbedding = 0, + NSTextWritingDirectionOverride = 2 + }*/ + + public enum NSTextMovement : ulong { // NSUInteger + NSIllegalTextMovement = 0, + NSReturnTextMovement = 16, + NSTabTextMovement = 17, + NSBacktabTextMovement = 18, + NSLeftTextMovement = 19, + NSRightTextMovement = 20, + NSUpTextMovement = 21, + NSDownTextMovement = 22, + NSCancelTextMovement = 23, + NSOtherTextMovement = 0 + } + + public enum NSTextTabType : ulong { // NSUInteger + NSLeftTabStopType = 0, + NSRightTabStopType = 1, + NSCenterTabStopType = 2, + NSDecimalTabStopType = 3 + } + + public enum NSLineBreakMode : ulong { // NSUInteger + ByWordWrapping = 0, + CharWrapping = 1, + Clipping = 2, + TruncatingHead = 3, + TruncatingTail = 4, + TruncatingMiddle = 5 + } + + public enum NSWorkspaceIconCreationOptions : ulong { // NSUInteger + NSWorkspaceLaunchAndPrint = 2, + NSWorkspaceLaunchInhibitingBackgroundOnly = 128, + NSWorkspaceLaunchWithoutAddingToRecents = 256, + NSWorkspaceLaunchWithoutActivation = 512, + NSWorkspaceLaunchAsync = 65536, + NSWorkspaceLaunchAllowingClassicStartup = 131072, + NSWorkspaceLaunchPreferringClassic = 262144, + NSWorkspaceLaunchNewInstance = 524288, + NSWorkspaceLaunchAndHide = 1048576, + NSWorkspaceLaunchAndHideOthers = 2097152, + NSWorkspaceLaunchDefault = 196608 + } + /* + public enum NSWorkspaceIconCreationOptions : ulong { // NSUInteger + NSExcludeQuickDrawElementsIconCreationOption = 2, + NSExclude10_4ElementsIconCreationOption = 4 + }*/ + + public enum NSApplicationActivationOptions : ulong { // NSUInteger + NSApplicationActivateAllWindows = 1, + NSApplicationActivateIgnoringOtherApps = 2 + } + + public enum NSApplicationActivationPolicy : long { // NSInteger + NSApplicationActivationPolicyRegular = 0, + NSApplicationActivationPolicyAccessory = 1, + NSApplicationActivationPolicyProhibited = 2 + } + + public enum NSRunResponse : long { // NSInteger + NSRunStoppedResponse = -1000, + NSRunAbortedResponse = -1001, + NSRunContinuesResponse = -1002 + } + + /* + public enum : ulong { // NSUInteger + NSUpdateWindowsRunLoopOrdering = 500000 + }*/ + + public enum NSApplicationPresentationOptions : ulong { // NSUInteger + NSApplicationPresentationDefault = 0, + NSApplicationPresentationAutoHideDock = 1, + NSApplicationPresentationHideDock = 2, + NSApplicationPresentationAutoHideMenuBar = 4, + NSApplicationPresentationHideMenuBar = 8, + NSApplicationPresentationDisableAppleMenu = 16, + NSApplicationPresentationDisableProcessSwitching = 32, + NSApplicationPresentationDisableForceQuit = 64, + NSApplicationPresentationDisableSessionTermination = 128, + NSApplicationPresentationDisableHideApplication = 256, + NSApplicationPresentationDisableMenuBarTransparency = 512, + /*} + + public enum NSApplicationPresentationOptions : ulong { // NSUInteger*/ + NSApplicationPresentationFullScreen = 1024, + NSApplicationPresentationAutoHideToolbar = 2048 + } + + public enum NSRequestUserAttentionType : ulong { // NSUInteger + NSCriticalRequest = 0, + NSInformationalRequest = 10 + } + + public enum NSApplicationDelegateReply : ulong { // NSUInteger + Success = 0, + Cancel = 1, + Failure = 2 + } + + public enum NSApplicationTerminateReply : ulong { // NSUInteger + Cancel = 0, + Now = 1, + Later = 2 + } + + public enum NSApplicationPrintReply : ulong { // NSUInteger + Cancelled = 0, + Success = 1, + Failure = 3, + ReplyLater = 2 + } + + public enum NSUserInterfaceLayoutDirection : long { // NSInteger + LeftToRight = 0, + RightToLeft = 1 + } + + public enum NSRemoteNotificationType : ulong { // NSUInteger + None = 0, + Badge = 1, + Sound = 2, + Alert = 4 + } + + public enum NSType : ulong { // NSUInteger + Any = 0, + Int = 1, + PositiveInt = 2, + Float = 3, + PositiveFloat = 4, + Double = 6, + PositiveDouble = 7 + } + + public enum NSCellType : ulong { // NSUInteger + Null = 0, + Text = 1, + Image = 2 + } + + public enum NSCellAttribute : ulong { // NSUInteger + NSCellDisabled = 0, + NSCellState = 1, + NSPushInCell = 2, + NSCellEditable = 3, + NSChangeGrayCell = 4, + NSCellHighlighted = 5, + NSCellLightsByContents = 6, + NSCellLightsByGray = 7, + NSChangeBackgroundCell = 8, + NSCellLightsByBackground = 9, + NSCellIsBordered = 10, + NSCellHasOverlappingImage = 11, + NSCellHasImageHorizontal = 12, + NSCellHasImageOnLeftOrBottom = 13, + NSCellChangesContents = 14, + NSCellIsInsetButton = 15, + NSCellAllowsMixedState = 16 } + public enum NSCellImagePosition : ulong { // NSUInteger + NoImage = 0, + ImageOnly = 1, + ImageLeft = 2, + ImageRight = 3, + ImageBelow = 4, + ImageAbove = 5, + ImageOverlaps = 6 + } + + public enum NSImageScaling : ulong { // NSUInteger + ProportionallyDown = 0, + AxesIndependently = 1, + None = 2, + ProportionallyUpOrDown = 3 + } + + public enum NSCellStateValue : long { // NSInteger + Mixed = -1, + Off = 0, + On = 1 + } + + [Flags] + public enum NSCellMask : ulong { // NSUInteger + None = 0, + Contents = 1, + PushIn = 2, + ChangeGray = 4, + ChangeBackground = 8 + } + + public enum NSControlTint : ulong { // NSUInteger + Default = 0, + Blue = 1, + Graphite = 6, + Clear = 7 + } + + public enum NSControlSize : ulong { // NSUInteger + Regular = 0, + Small = 1, + Mini = 2 + } + + public enum NSCellHit : ulong { // NSUInteger + None = 0, + ContentArea = 1, + EditableTextArea = 2, + TrackableArea = 4 + } + + public enum NSBackgroundStyle : long { // NSInteger + Light = 0, + Dark = 1, + Raised = 2, + Lowered = 3 + } + /* + public enum : ulong { // NSUInteger + NSScaleProportionally = 0, + NSScaleToFit = 1, + NSScaleNone = 2 + } +*/ + + public enum NSAlertStyle : ulong { // NSUInteger + Warning = 0, + Informational = 1, + Critical = 2 + } + /* + public enum : ulong { // NSUInteger + NSAlertFirstButtonReturn = 1000, + NSAlertSecondButtonReturn = 1001, + NSAlertThirdButtonReturn = 1002 + } +*/ + + + + + + + + public enum NSApplicationLayoutDirection { + LeftToRight = 0, + RightToLeft = 1 + } + + public enum NSComposite { + Clear, + Copy, + SourceOver, + SourceIn, + SourceOut, + SourceAtop, + DestinationOver, + DestinationIn, + DestinationOut, + DestinationAtop, + XOR, + PlusDarker, + Highlight, + PlusLighter, + } + +#if MAC64 + public enum NSBackingStore : ulong { +#else + public enum NSBackingStore { +#endif + Retained, Nonretained, Buffered + } + + + + + //TODO: review size for 64 bit + public enum NSRectEdge { + MinXEdge, MinYEdge, MaxXEdge, MaxYEdge + } + + +#region NSColorSpace + public enum NSColorSpaceModel { + Unknown = -1, + Gray, + RGB, + CMYK, + LAB, + DeviceN, + Indexed, + Pattern + } #endregion -#region NSView +#region NSFileWrapper [Flags] - public enum NSViewResizingMask { - NotSizable = 0, - MinXMargin = 1, - WidthSizable = 2, - MaxXMargin = 4, - MinYMargin = 8, - HeightSizable = 16, - MaxYMargin = 32 + public enum NSFileWrapperReadingOptions { + Immediate = 1, WithoutMapping = 2 } +#endregion - public enum NSBorderType { - NoBorder, LineBorder, BezelBorder, GrooveBorder + +#region NSCell Defines + + public enum NSImageScale { + ProportionallyDown = 0, + AxesIndependently, + None, + ProportionallyUpOrDown } +#endregion - public enum NSTextFieldBezelStyle { - Square, Rounded +#region NSImage + + public enum NSImageLoadStatus { + Completed, + Cancelled, + InvalidData, + UnexpectedEOF, + ReadError } - public enum NSViewLayerContentsRedrawPolicy { - Never, OnSetNeedsDisplay, DuringViewResize, BeforeViewResize + public enum NSImageCacheMode { + Default, + Always, + BySize, + Never } + +#endregion + - public enum NSViewLayerContentsPlacement { - ScaleAxesIndependently, - ScaleProportionallyToFit, - ScaleProportionallyToFill, - Center, - Top, - TopRight, - Right, - BottomRight, - Bottom, - BottomLeft, - Left, - TopLeft, +#region NSEvent + + [Flags] + public enum NSPointingDeviceMask { + Pen = 1, PenLower = 2, PenUpper = 4 + } + + + + + public enum NSEventMouseSubtype { + Mouse, TablePoint, TabletProximity, Touch + } + +#endregion + +#region NSView + + + public enum NSTextFieldBezelStyle { + Square, Rounded } + + #endregion #region NSWindow [Flags] +#if MAC64 + public enum NSWindowStyle : ulong { +#else public enum NSWindowStyle { +#endif Borderless = 0, Titled = 1 << 0, Closable = 1 << 1, @@ -626,16 +919,28 @@ public enum NSWindowStyle { FullScreenWindow = 1 << 14 } +#if MAC64 + public enum NSWindowSharingType : ulong { +#else public enum NSWindowSharingType { +#endif None, ReadOnly, ReadWrite } +#if MAC64 + public enum NSWindowBackingLocation : ulong { +#else public enum NSWindowBackingLocation { +#endif Default, VideoMemory, MainMemory, } [Flags] +#if MAC64 + public enum NSWindowCollectionBehavior : ulong { +#else public enum NSWindowCollectionBehavior { +#endif Default = 0, CanJoinAllSpaces = 1 << 0, MoveToActiveSpace = 1 << 1, @@ -648,47 +953,33 @@ public enum NSWindowCollectionBehavior { FullScreenAuxiliary = 1 << 8 } +#if MAC64 + public enum NSWindowNumberListOptions : ulong { +#else public enum NSWindowNumberListOptions { +#endif AllApplication = 1 << 0, AllSpaces = 1 << 4 } +#if MAC64 + public enum NSSelectionDirection : ulong { +#else public enum NSSelectionDirection { +#endif Direct = 0, Next, Previous } +#if MAC64 + public enum NSWindowButton : ulong { +#else public enum NSWindowButton { +#endif CloseButton, MiniaturizeButton, ZoomButton, ToolbarButton, DocumentIconButton, DocumentVersionsButton = 6, FullScreenButton } - [Flags] - public enum NSTouchPhase { - Began = 1 << 0, - Moved = 1 << 1, - Stationary = 1 << 2, - Ended = 1 << 3, - Cancelled = 1 << 4, - - Touching = Began | Moved | Stationary, - Any = -1 - } -#endregion -#region NSAnimation - - public enum NSAnimationCurve { - EaseInOut, - EaseIn, - EaseOut, - Linear - }; - - public enum NSAnimationBlockingMode { - Blocking, - Nonblocking, - NonblockingThreaded - }; #endregion #region NSBox @@ -713,7 +1004,11 @@ public enum NSBoxType { #endregion #region NSButtonCell +#if MAC64 + public enum NSButtonType : ulong { +#else public enum NSButtonType { +#endif MomentaryLightButton, PushOnPushOff, Toggle, @@ -724,7 +1019,11 @@ public enum NSButtonType { MomentaryPushIn } +#if MAC64 + public enum NSBezelStyle : ulong { +#else public enum NSBezelStyle { +#endif Rounded = 1, RegularSquare, ThickSquare, @@ -752,36 +1051,6 @@ public enum NSGradientType { #endregion -#region NSGraphics - public enum NSWindowDepth { - TwentyfourBitRgb = 0x208, - SixtyfourBitRgb = 0x210, - OneHundredTwentyEightBitRgb = 0x220 - } - - public enum NSCompositingOperation { - Clear, - Copy, - SourceOver, - SourceIn, - SourceOut, - SourceAtop, - DestinationOver, - DestinationIn, - DestinationOut, - DestinationAtop, - Xor, - PlusDarker, - Highlight, - PlusLighter, - } - - public enum NSAnimationEffect { - DissapearingItemDefault = 0, - EffectPoof = 10 - } -#endregion - #region NSMatrix public enum NSMatrixMode { Radio, Highlight, List, Track @@ -865,41 +1134,8 @@ public enum NSRulerOrientation { } #endregion - [Flags] - public enum NSDragOperation : uint { - None, - Copy = 1, - Link = 2, - Generic = 4, - Private = 8, - AllObsolete = 15, - Move = 16, - Delete = 32, - All = UInt32.MaxValue - } - public enum NSTextAlignment { - Left, Right, Center, Justified, Natural - } - [Flags] - public enum NSWritingDirection { - Natural = -1, LeftToRight, RightToLeft, - Embedding = 0, - Override = 2, - } - - public enum NSTextMovement { - Other = 0, - Return = 0x10, - Tab = 0x11, - Backtab = 0x12, - Left = 0x13, - Right = 0x14, - Up = 0x15, - Down = 0x16, - Cancel = 0x17 - } [Flags] public enum NSMenuProperty { @@ -948,7 +1184,11 @@ public enum NSSelectionGranularity { #region NSTrackingArea [Flags] +#if MAC64 + public enum NSTrackingAreaOptions : ulong { +#else public enum NSTrackingAreaOptions { +#endif MouseEnteredAndExited = 0x01, MouseMoved = 0x02, CursorUpdate = 0x04, @@ -1145,11 +1385,19 @@ public enum NSPasteboardWritingOptions { } +#if MAC64 + public enum NSToolbarDisplayMode : ulong { +#else public enum NSToolbarDisplayMode { +#endif Default, IconAndLabel, Icon, Label } +#if MAC64 + public enum NSToolbarSizeMode : ulong { +#else public enum NSToolbarSizeMode { +#endif Default, Regular, Small } @@ -1244,12 +1492,6 @@ public enum NSSplitViewDividerStyle { PaneSplitter = 3 } - public enum NSImageScaling { - ProportionallyDown = 0, - AxesIndependently, - None, - ProportionallyUpOrDown - } public enum NSSegmentStyle { Automatic = 0, @@ -1279,14 +1521,22 @@ public enum NSSliderType { Circular = 1 } +#if MAC64 + public enum NSTokenStyle : ulong { +#else public enum NSTokenStyle { +#endif Default, PlainText, Rounded } [Flags] +#if MAC64 + public enum NSWorkspaceLaunchOptions : ulong { +#else public enum NSWorkspaceLaunchOptions { +#endif Print = 2, InhibitingBackgroundOnly = 0x80, WithoutAddingToRecents = 0x100, @@ -1300,11 +1550,6 @@ public enum NSWorkspaceLaunchOptions { Default = Async | AllowingClassicStartup } - [Flags] - public enum NSWorkspaceIconCreationOptions { - NSExcludeQuickDrawElements = 1 << 1, - NSExclude10_4Elements = 1 << 2 - } public enum NSPathStyle { NSPathStyleStandard, @@ -1508,7 +1753,11 @@ public enum NSDrawerState { Closing = 3 } +#if MAC64 + public enum NSWindowLevel : long { +#else public enum NSWindowLevel { +#endif Normal = 0, Dock = 20, Floating = 3, @@ -1520,12 +1769,17 @@ public enum NSWindowLevel { Submenu = 3, TornOffMenu = 3 } - + +#if MAC64 + public enum NSRuleEditorRowType : ulong { +#else public enum NSRuleEditorRowType{ +#endif Simple = 0, Compound } + //TODO: figure out size for 64 bit public enum NSRuleEditorNestingMode { Single, List, @@ -1546,13 +1800,7 @@ public enum NSTypesetterBehavior { Specific_10_4 = 4, } - - [Flags] - public enum NSRemoteNotificationType { - None = 0, - Badge = 1 - } - + public enum NSScrollViewFindBarPosition { AboveHorizontalRuler = 0, AboveContent, @@ -1576,25 +1824,6 @@ public enum NSScrollerKnobStyle { Light = 2 } - [Flags] - public enum NSEventPhase { - None, - Began = 1, - Stationary = 2, - Changed = 4, - Ended = 8, - Cancelled = 16 - } - - [Flags] - public enum NSEventSwipeTrackingOptions { - LockDirection = 1, - ClampGestureAmount = 2 - } - - public enum NSEventGestureAxis { - None, Horizontal, Vertical - } public enum NSLayoutRelation { LessThanOrEqual = -1, @@ -1602,7 +1831,11 @@ public enum NSLayoutRelation { GreaterThanOrEqual = 1 } +#if MAC64 + public enum NSLayoutAttribute : long { +#else public enum NSLayoutAttribute { +#endif NoAttribute = 0, Left = 1, Right, @@ -1620,15 +1853,15 @@ public enum NSLayoutAttribute { public enum NSLayoutFormatOptions { None = 0, - AlignAllLeft = (1 << NSLayoutAttribute.Left), - AlignAllRight = (1 << NSLayoutAttribute.Right), - AlignAllTop = (1 << NSLayoutAttribute.Top), - AlignAllBottom = (1 << NSLayoutAttribute.Bottom), - AlignAllLeading = (1 << NSLayoutAttribute.Leading), - AlignAllTrailing = (1 << NSLayoutAttribute.Trailing), - AlignAllCenterX = (1 << NSLayoutAttribute.CenterX), - AlignAllCenterY = (1 << NSLayoutAttribute.CenterY), - AlignAllBaseline = (1 << NSLayoutAttribute.Baseline), + AlignAllLeft = (1 << (int)NSLayoutAttribute.Left), + AlignAllRight = (1 << (int)NSLayoutAttribute.Right), + AlignAllTop = (1 << (int)NSLayoutAttribute.Top), + AlignAllBottom = (1 << (int)NSLayoutAttribute.Bottom), + AlignAllLeading = (1 << (int)NSLayoutAttribute.Leading), + AlignAllTrailing = (1 << (int)NSLayoutAttribute.Trailing), + AlignAllCenterX = (1 << (int)NSLayoutAttribute.CenterX), + AlignAllCenterY = (1 << (int)NSLayoutAttribute.CenterY), + AlignAllBaseline = (1 << (int)NSLayoutAttribute.Baseline), AlignmentMask = 0xFFFF, @@ -1641,7 +1874,11 @@ public enum NSLayoutFormatOptions { DirectionMask = 0x3 << 16, } +#if MAC64 + public enum NSLayoutConstraintOrientation : long { +#else public enum NSLayoutConstraintOrientation { +#endif Horizontal, Vertical } @@ -1675,21 +1912,11 @@ public enum NSTableViewAnimation { SlideUp = 0x10, SlideDown = 0x20, SlideLeft = 0x30, SlideRight = 0x40 } - [Flags] - public enum NSDraggingItemEnumerationOptions { - Concurrent = 1 << 0, - ClearNonenumeratedImages = 1 << 16 - } - - public enum NSDraggingFormation { - Default, None, Pile, List, Stack - } - - public enum NSDraggingContext { - OutsideApplication, WithinApplication - } - +#if MAC64 + public enum NSWindowAnimationBehavior : long { +#else public enum NSWindowAnimationBehavior { +#endif Default = 0, None = 2, DocumentWindow, UtilityWindow, AlertPanel } @@ -1732,7 +1959,11 @@ public enum NSFontCollectionVisibility { Computer = 1 << 2, } +#if MAC64 + public enum NSSharingContentScope : long { +#else public enum NSSharingContentScope { +#endif Item, Partial, Full diff --git a/src/AppKit/NSAlert.cs b/src/AppKit/NSAlert.cs index bfd8d34c6..d102d93d7 100644 --- a/src/AppKit/NSAlert.cs +++ b/src/AppKit/NSAlert.cs @@ -31,6 +31,20 @@ using MonoMac.Foundation; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + + namespace MonoMac.AppKit { [Register ("__MonoMac_NSAlertDidEndDispatcher")] @@ -84,12 +98,12 @@ public void BeginSheetForResponse (NSWindow window, Action onEnded) BeginSheet (window, new NSAlertDidEndDispatcher (onEnded), NSAlertDidEndDispatcher.Selector, IntPtr.Zero); } - public int RunSheetModal (NSWindow window) + public NSInteger RunSheetModal (NSWindow window) { return RunSheetModal (window, NSApplication.SharedApplication); } - public int RunSheetModal (NSWindow window, NSApplication application) + public NSInteger RunSheetModal (NSWindow window, NSApplication application) { if (application == null) throw new ArgumentNullException ("application"); @@ -98,7 +112,7 @@ public int RunSheetModal (NSWindow window, NSApplication application) if (window == null) return RunModal (); - int returnCode = -1000; + NSInteger returnCode = -1000; BeginSheetForResponse (window, r => { returnCode = r; diff --git a/src/AppKit/NSBezierPath.cs b/src/AppKit/NSBezierPath.cs index 9b16c02f9..80442a7ca 100644 --- a/src/AppKit/NSBezierPath.cs +++ b/src/AppKit/NSBezierPath.cs @@ -31,22 +31,37 @@ using MonoMac.ObjCRuntime; using System.Runtime.InteropServices; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + namespace MonoMac.AppKit { public partial class NSBezierPath { - public void GetLineDash (out float[] pattern, out float phase) + public void GetLineDash (out CGFloat[] pattern, out CGFloat phase) { //Call the internal method with null to get the length of the pattern array - int length; - _GetLineDash ((IntPtr)null, out length, out phase); + NSInteger _length; + _GetLineDash ((IntPtr)null, out _length, out phase); + int length = (int)_length; //Allocate space for the C-array - float[] managedArray = new float[length]; + CGFloat[] managedArray = new CGFloat[length]; int size = Marshal.SizeOf(managedArray[0]) * length; IntPtr pNativeArray = Marshal.AllocHGlobal(size); //Call the method again to get the array - _GetLineDash (pNativeArray, out length, out phase); + _GetLineDash (pNativeArray, out _length, out phase); + length = (int)_length; Marshal.Copy(pNativeArray, managedArray, 0, length); Marshal.FreeHGlobal(pNativeArray); @@ -54,7 +69,7 @@ public void GetLineDash (out float[] pattern, out float phase) pattern = managedArray; } - public void SetLineDash (float[] pattern, float phase) + public void SetLineDash (CGFloat[] pattern, CGFloat phase) { if (pattern == null) throw new ArgumentNullException ("pattern"); @@ -68,10 +83,10 @@ public void SetLineDash (float[] pattern, float phase) Marshal.FreeHGlobal(pNativeArray); } - public NSBezierPathElement ElementAt (int index, out PointF[] points) + public NSBezierPathElement ElementAt (NSInteger index, out NSPoint[] points) { //return array will be 1 or 3 points, depending on type. - int size = Marshal.SizeOf(typeof(PointF)) * 3; + int size = Marshal.SizeOf(typeof(NSPoint)) * 3; IntPtr pNativeArray = Marshal.AllocHGlobal(size); NSBezierPathElement bpe = _ElementAt (index, pNativeArray); @@ -79,12 +94,12 @@ public NSBezierPathElement ElementAt (int index, out PointF[] points) int length = 1; if (bpe == NSBezierPathElement.CurveTo) length = 3; - points = new PointF[length]; + points = new NSPoint[length]; IntPtr currentPtr = pNativeArray; for (int i = 0; i < length; i++) { - points[i] = (PointF)Marshal.PtrToStructure(currentPtr, typeof(PointF)); + points[i] = (NSPoint)Marshal.PtrToStructure(currentPtr, typeof(NSPoint)); currentPtr = (IntPtr)((long)currentPtr + Marshal.SizeOf(points[i])); } @@ -93,7 +108,7 @@ public NSBezierPathElement ElementAt (int index, out PointF[] points) return bpe; } - public void SetAssociatedPointsAtIndex (PointF[] points, int index) + public void SetAssociatedPointsAtIndex (NSPoint[] points, NSInteger index) { if (points == null) throw new ArgumentNullException ("points"); @@ -114,7 +129,7 @@ public void SetAssociatedPointsAtIndex (PointF[] points, int index) Marshal.FreeHGlobal(pNativeArray); } - public void AppendPathWithPoints (PointF[] points) + public void AppendPathWithPoints (NSPoint[] points) { if (points == null) throw new ArgumentNullException ("points"); diff --git a/src/AppKit/NSButton.cs b/src/AppKit/NSButton.cs index 92a28622b..e22bf75ef 100644 --- a/src/AppKit/NSButton.cs +++ b/src/AppKit/NSButton.cs @@ -30,8 +30,15 @@ using MonoMac.Foundation; namespace MonoMac.AppKit { - public partial class NSButton { +#if MAC64 + [Export ("initWithFrame:")] + public NSButton (System.Drawing.RectangleF frameRect) + : this (new NSRect(frameRect)) + { + } +#endif + public new NSButtonCell Cell { get { return (NSButtonCell)base.Cell; } set { base.Cell = value; } diff --git a/src/AppKit/NSColor.cs b/src/AppKit/NSColor.cs index 8cfd485c2..0679e5738 100644 --- a/src/AppKit/NSColor.cs +++ b/src/AppKit/NSColor.cs @@ -4,6 +4,19 @@ using MonoMac.ObjCRuntime; using System.Runtime.InteropServices; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + namespace MonoMac.AppKit { public partial class NSColor { @@ -23,10 +36,10 @@ public static NSColor FromColorSpace (NSColorSpace space, float[] components) return color; } - public void GetComponents(out float[] components) + public void GetComponents(out CGFloat[] components) { - int count = this.ComponentCount; - float[] managedFloatArray = new float[count]; + int count = (int)this.ComponentCount; + CGFloat[] managedFloatArray = new CGFloat[count]; int size = Marshal.SizeOf(managedFloatArray[0]) * count; IntPtr pNativeFloatArray = Marshal.AllocHGlobal(size); @@ -47,7 +60,7 @@ public override string ToString () return "Pattern Color: " + this.PatternImage.Name; StringBuilder sb = new StringBuilder (this.ColorSpace.LocalizedName); - float[] components; + CGFloat[] components; this.GetComponents (out components); if (components.Length > 0) sb.Append ("(" + components [0]); diff --git a/src/AppKit/NSControl.cs b/src/AppKit/NSControl.cs index 726a599d4..b6d167943 100644 --- a/src/AppKit/NSControl.cs +++ b/src/AppKit/NSControl.cs @@ -32,7 +32,14 @@ namespace MonoMac.AppKit { public partial class NSControl { - +#if MAC64 + [Export ("initWithFrame:")] + public NSControl (System.Drawing.RectangleF frameRect) + : this (new NSRect(frameRect)) + { + } +#endif + public event EventHandler Activated { add { Target = ActionDispatcher.SetupAction (Target, value); diff --git a/src/AppKit/NSEvent.cs b/src/AppKit/NSEvent.cs index 7bc0baf81..0e0ee5699 100644 --- a/src/AppKit/NSEvent.cs +++ b/src/AppKit/NSEvent.cs @@ -4,6 +4,20 @@ using MonoMac.Foundation; using MonoMac.CoreGraphics; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + + namespace MonoMac.AppKit { [DebuggerTypeProxy (typeof(NSEvent.NSEventDebuggerProxy))] @@ -26,7 +40,7 @@ internal NSGraphicsContext Context { } } - public PointF LocationInWindow { + public NSPoint LocationInWindow { get { return target.LocationInWindow; } @@ -56,7 +70,7 @@ public NSWindow Window { } } - public int WindowNumber { + public NSInteger WindowNumber { get { return target.WindowNumber; } @@ -160,49 +174,49 @@ void CheckTabletPointingEvent () throw new InvalidOperationException ("Not a tablet pointing event."); } - public int AbsoluteX { + public NSInteger AbsoluteX { get { CheckTabletPointingEvent (); return target.AbsoluteX; } } - public int AbsoluteY { + public NSInteger AbsoluteY { get { CheckTabletPointingEvent (); return target.AbsoluteY; } } - public int AbsoluteZ { + public NSInteger AbsoluteZ { get { CheckTabletPointingEvent (); return target.AbsoluteZ; } } - public uint ButtonMask { + public NSUInteger ButtonMask { get { CheckTabletPointingEvent (); return target.ButtonMask; } } - public float Rotation { + public CGFloat Rotation { get { CheckTabletPointingEvent (); return target.Rotation; } } - public float TangentialPressure { + public CGFloat TangentialPressure { get { CheckTabletPointingEvent (); return target.TangentialPressure; } } - public PointF Tilt { + public NSPoint Tilt { get { CheckTabletPointingEvent (); return target.Tilt; @@ -227,21 +241,21 @@ void CheckMouseEvent () throw new InvalidOperationException ("Not a mouse event."); } - public int ButtonNumber { + public NSInteger ButtonNumber { get { CheckMouseEvent (); return target.ButtonNumber; } } - public int ClickCount { + public NSInteger ClickCount { get { CheckMouseEvent (); return target.ClickCount; } } - public float Pressure { + public CGFloat Pressure { get { CheckMouseEvent (); return target.Pressure; @@ -265,14 +279,14 @@ void CheckMouseTrackingEvent () throw new InvalidOperationException ("Not a mouse tracking event."); } - internal int EventNumber { + internal NSInteger EventNumber { get { CheckMouseTrackingEvent (); return target.EventNumber; } } - internal int TrackingNumber { + internal NSInteger TrackingNumber { get { CheckMouseTrackingEvent (); return target.TrackingNumber; @@ -324,14 +338,14 @@ public short Subtype { } } - public int Data1 { + public NSInteger Data1 { get { CheckCustomEvent (); return target.Data1; } } - public int Data2 { + public NSInteger Data2 { get { CheckCustomEvent (); return target.Data1; @@ -359,21 +373,21 @@ void CheckScrollWheelEvent () throw new InvalidOperationException ("Not a scroll wheel event."); } - public float DeltaX { + public CGFloat DeltaX { get { CheckScrollWheelEvent (); return target.Data1; } } - public float DeltaY { + public CGFloat DeltaY { get { CheckScrollWheelEvent (); return target.Data1; } } - public float DeltaZ { + public CGFloat DeltaZ { get { CheckScrollWheelEvent (); return target.Data1; @@ -398,14 +412,14 @@ void CheckTabletProximityEvent () throw new InvalidOperationException ("Not a tablet proximity event."); } - public uint CapabilityMask { + public NSUInteger CapabilityMask { get { CheckTabletProximityEvent (); return target.CapabilityMask; } } - public uint DeviceID { + public NSUInteger DeviceID { get { CheckTabletProximityEvent (); return target.DeviceID; @@ -419,14 +433,14 @@ public bool IsEnteringProximity { } } - public uint PointingDeviceSerialNumber { + public NSUInteger PointingDeviceSerialNumber { get { CheckTabletProximityEvent (); return target.PointingDeviceSerialNumber; } } - public uint PointingDeviceID { + public NSUInteger PointingDeviceID { get { CheckTabletProximityEvent (); return target.PointingDeviceID (); @@ -440,14 +454,14 @@ public NSPointingDeviceType PointingDeviceType { } } - public uint SystemTabletID { + public NSUInteger SystemTabletID { get { CheckTabletProximityEvent (); return target.SystemTabletID; } } - public uint TabletID { + public NSUInteger TabletID { get { CheckTabletProximityEvent (); return target.TabletID; @@ -461,14 +475,14 @@ public long UniqueID { } } - public uint VendorID { + public NSUInteger VendorID { get { CheckTabletProximityEvent (); return target.VendorID; } } - public uint VendorPointingDeviceType { + public NSUInteger VendorPointingDeviceType { get { CheckTabletProximityEvent (); return target.VendorPointingDeviceType; @@ -492,7 +506,7 @@ void CheckTouchOrGestureEvent () throw new InvalidOperationException ("Not a touch or gesture event."); } - internal float Magnification { + internal CGFloat Magnification { get { CheckTouchOrGestureEvent (); return target.Magnification; @@ -524,14 +538,14 @@ public bool HasPreciseScrollingDeltas { } } - public float ScrollingDeltaX { + public CGFloat ScrollingDeltaX { get { CheckScrollWheelOrFlickEvent (); return target.ScrollingDeltaX; } } - public float ScrollingDeltaY { + public CGFloat ScrollingDeltaY { get { CheckScrollWheelOrFlickEvent (); return target.ScrollingDeltaY; diff --git a/src/AppKit/NSTableView.cs b/src/AppKit/NSTableView.cs index d770cda0a..ed0c040c7 100644 --- a/src/AppKit/NSTableView.cs +++ b/src/AppKit/NSTableView.cs @@ -25,6 +25,20 @@ // using MonoMac.Foundation; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + + namespace MonoMac.AppKit { public partial class NSTableView { @@ -42,12 +56,12 @@ public NSTableViewSource Source { } } - public void SelectRow (int row, bool byExtendingSelection) + public void SelectRow (NSUInteger row, bool byExtendingSelection) { SelectRows (NSIndexSet.FromIndex (row), byExtendingSelection); } - public void SelectColumn (int column, bool byExtendingSelection) + public void SelectColumn (NSUInteger column, bool byExtendingSelection) { SelectColumns (NSIndexSet.FromIndex (column), byExtendingSelection); } diff --git a/src/AppKit/NSView.cs b/src/AppKit/NSView.cs new file mode 100644 index 000000000..86d8fdd0e --- /dev/null +++ b/src/AppKit/NSView.cs @@ -0,0 +1,45 @@ +// +// NSView.cs: Support for the NSView class +// +// Author: +// Miguel de Icaza (miguel@gnome.org) +// +// 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 MonoMac.ObjCRuntime; +using MonoMac.Foundation; +using System.Drawing; + +namespace MonoMac.AppKit { + + public partial class NSView { +#if MAC64 + [Export ("initWithFrame:")] + public NSView (RectangleF frameRect) + : this (new NSRect(frameRect)) + { + } + +#endif + } +} diff --git a/src/Foundation/NSObject.cs b/src/Foundation/NSObject.cs index dfca4f38c..1b685c41a 100644 --- a/src/Foundation/NSObject.cs +++ b/src/Foundation/NSObject.cs @@ -43,10 +43,10 @@ private void InitializeObject (bool alloced) { if (alloced && handle == IntPtr.Zero && Class.ThrowOnInitFailure) { if (ClassHandle == IntPtr.Zero) throw new Exception (string.Format ("Could not create an native instance of the type '{0}': the native class hasn't been loaded.\n" + - "It is possible to ignore this condition by setting Class.ThrowOnInitFailure to false.", + "It is possible to ignore this condition by setting MonoMac.ObjCRuntime.Class.ThrowOnInitFailure to false.", GetType ().FullName)); throw new Exception (string.Format ("Failed to create a instance of the native type '{0}'.\n" + - "It is possible to ignore this condition by setting Class.ThrowOnInitFailure to false.", + "It is possible to ignore this condition by setting MonoMac.ObjCRuntime.Class.ThrowOnInitFailure to false.", new Class (ClassHandle).Name)); } diff --git a/src/Make.shared b/src/Make.shared index 338ae66e0..6be0e279c 100644 --- a/src/Make.shared +++ b/src/Make.shared @@ -213,8 +213,11 @@ SHARED_CORE_SOURCE = \ ./Foundation/ModelAttribute.cs \ ./Foundation/NSAction.cs \ ./Foundation/NSDecimal.cs \ + ./Foundation/NSPoint.cs \ ./Foundation/NSRange.cs \ + ./Foundation/NSRect.cs \ ./Foundation/NSObject2.cs \ + ./Foundation/NSSize.cs \ ./Foundation/NSString.cs \ ./Foundation/RegisterAttribute.cs \ ./Foundation/PreserveAttribute.cs \ diff --git a/src/Makefile b/src/Makefile index ff7e32208..fe3d54651 100644 --- a/src/Makefile +++ b/src/Makefile @@ -89,6 +89,7 @@ MONOMAC_SOURCES = $(EXTRA_MONOMAC_SOURCES) \ ./AppKit/NSTableView.cs \ ./AppKit/NSToolbarItem.cs \ ./AppKit/NSTreeController.cs \ + ./AppKit/NSView.cs \ ./AppKit/NSWindow.cs \ ./CoreVideo/CVDisplayLink.cs \ ./QTKit/QTCaptureDevice.cs \ @@ -148,6 +149,10 @@ SOURCES = \ DEFINES = -define:NET_2_0 +# Uncomment the following two lines to build targetting 64 bit +DEFINES64 = -define:MAC64 +BMAC_DEFINES64 = -d=MAC64 + HAVE_ASYNC := $(shell if pkg-config --atleast-version=2.11 mono; then echo true; else echo false; fi) ifeq ($(HAVE_ASYNC),true) @@ -199,16 +204,16 @@ parse.exe: parse.cs $(MACCORE_DIR)/src/Options.cs gmcs -debug parse.cs $(MACCORE_DIR)/src/Options.cs core.dll: $(CORE_SOURCES) $(SHARED_CORE_SOURCES) Makefile - gmcs -target:library -debug -unsafe -out:core.dll -define:MONOMAC,MONOMAC_BOOTSTRAP,COREBUILD$(CORE_DLL_DEFINES) $(CORE_SOURCES) $(SHARED_CORE_SOURCES) -r:System.Drawing + gmcs -target:library -debug -unsafe -out:core.dll $(DEFINES64) -define:MONOMAC,MONOMAC_BOOTSTRAP,COREBUILD$(CORE_DLL_DEFINES) $(CORE_SOURCES) $(SHARED_CORE_SOURCES) -r:System.Drawing _bmac.exe: $(APIS) core.dll $(GENERATOR_SOURCES) - gmcs -unsafe -out:_bmac.exe -debug $(DEFINES) -define:GENERATOR,MONOMAC,MONOMAC_BOOTSTRAP $(GENERATOR_SOURCES) -r:core.dll -r:System.Drawing + gmcs -unsafe -out:_bmac.exe -debug $(DEFINES) $(DEFINES64) -define:GENERATOR,MONOMAC,MONOMAC_BOOTSTRAP $(GENERATOR_SOURCES) -r:core.dll -r:System.Drawing generated_sources: _bmac.exe $(APIS) - mono --debug _bmac.exe -a -d=MONOMAC $(BMAC_DEFINES) --core --sourceonly=generated_sources -v -tmpdir=. $(APIS) --baselib=core.dll --ns=MonoMac.ObjCRuntime -r=System.Drawing + mono --debug _bmac.exe -a -d=MONOMAC $(BMAC_DEFINES64) $(BMAC_DEFINES) --core --sourceonly=generated_sources -v -tmpdir=. $(APIS) --baselib=core.dll --ns=MonoMac.ObjCRuntime -r=System.Drawing bmac.exe: $(TARGET) $(GENERATOR_SOURCES) - gmcs -unsafe -out:bmac.exe -debug $(DEFINES) -define:GENERATOR,MONOMAC,MONOMAC_BOOTSTRAP $(GENERATOR_SOURCES) -r:$(TARGET) -r:System.Drawing + gmcs -unsafe -out:bmac.exe -debug $(DEFINES) $(DEFINES64) -define:GENERATOR,MONOMAC,MONOMAC_BOOTSTRAP $(GENERATOR_SOURCES) -r:$(TARGET) -r:System.Drawing count: make pass | wc -l @@ -217,10 +222,10 @@ counts: make pass | grep 'could not be' | sed 's/.*`//' | sed "s/'.*//" | sort | uniq -c | sort -n $(TARGET): $(SOURCES) generated_sources $(MONOMAC_SOURCES) $(SHARED_SOURCES) $(SHARED_CORE_SOURCES) $(OPENTK_SOURCES) - gmcs -define:OBJECT_REF_TRACKING -nowarn:3021,0219,0414,$(WARNINGS_I_SHOULD_FIX) -debug -unsafe $(SOURCES) @generated_sources $(MONOMAC_SOURCES) $(SHARED_SOURCES) $(SHARED_CORE_SOURCES) $(OPENTK_SOURCES) -target:library -define:MONOMAC -out:$(TARGET) -r:System.Drawing + gmcs -define:OBJECT_REF_TRACKING $(DEFINES64) -nowarn:3021,0219,0414,$(WARNINGS_I_SHOULD_FIX) -debug -unsafe $(SOURCES) @generated_sources $(MONOMAC_SOURCES) $(SHARED_SOURCES) $(SHARED_CORE_SOURCES) $(OPENTK_SOURCES) -target:library -define:MONOMAC -out:$(TARGET) -r:System.Drawing MonoMac.CFNetwork.dll: $(CFNETWORK_SOURCES) - mcs -debug -target:library -define:MONOMAC -r:System.Net.Http -r:$(TARGET) -out:MonoMac.CFNetwork.dll $(CFNETWORK_SOURCES) + mcs -debug -target:library -define:MONOMAC $(DEFINES64) -r:System.Net.Http -r:$(TARGET) -out:MonoMac.CFNetwork.dll $(CFNETWORK_SOURCES) clean: rm -f $(TARGETS) core.dll diff --git a/src/OpenGL/MonoMacGameView.cs b/src/OpenGL/MonoMacGameView.cs index 9d5b40219..c86be807a 100644 --- a/src/OpenGL/MonoMacGameView.cs +++ b/src/OpenGL/MonoMacGameView.cs @@ -85,7 +85,11 @@ public MonoMacGameView (RectangleF frame, NSOpenGLContext context) : base(frame) } [Preserve (Conditional=true)] +#if MAC64 + public override void DrawRect (NSRect dirtyRect) +#else public override void DrawRect (RectangleF dirtyRect) +#endif { if (animating) { if (displayLinkSupported) { diff --git a/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs b/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs index de79b6a5b..262268f84 100644 --- a/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs +++ b/src/OpenGL/OpenTK/Graphics/OpenGL/GLHelper.cs @@ -161,8 +161,7 @@ public static void ClearColor(System.Drawing.Color color) public static void ClearColor(MonoMac.AppKit.NSColor color) { - GL.ClearColor(color.RedComponent, color.GreenComponent, color.BlueComponent, color.AlphaComponent); - + GL.ClearColor((float)color.RedComponent, (float)color.GreenComponent, (float)color.BlueComponent, (float)color.AlphaComponent); } public static void ClearColor(Color4 color) @@ -181,8 +180,7 @@ public static void BlendColor(System.Drawing.Color color) public static void BlendColor(MonoMac.AppKit.NSColor color) { - - GL.BlendColor(color.RedComponent, color.GreenComponent, color.BlueComponent, color.AlphaComponent); + GL.BlendColor((float)color.RedComponent, (float)color.GreenComponent, (float)color.BlueComponent, (float)color.AlphaComponent); } public static void BlendColor(Color4 color) diff --git a/src/appkit.cs b/src/appkit.cs index 86e6fb2e3..33cb2f8e6 100644 --- a/src/appkit.cs +++ b/src/appkit.cs @@ -41,15 +41,39 @@ using MonoMac.CoreData; using MonoMac.OpenGL; +#if MAC64 +using NSInteger = System.Int64; +using NSUInteger = System.UInt64; +using CGFloat = System.Double; +#else +using NSInteger = System.Int32; +using NSUInteger = System.UInt32; +using NSPoint = System.Drawing.PointF; +using NSSize = System.Drawing.SizeF; +using NSRect = System.Drawing.RectangleF; +using CGFloat = System.Single; +#endif + namespace MonoMac.AppKit { - + [AttributeUsage( AttributeTargets.All, AllowMultiple=true )] + sealed class VerifyAttribute : System.Attribute + { + readonly string m_description; + public VerifyAttribute(string description) + { + Description = description; + } + public string Description { get; private set; } + public int Line { get; set; } + } + //[BaseType (typeof (NSObject))] //interface CIImage { // [Export ("drawInRect:fromRect:operation:fraction:")] - // void Draw (RectangleF inRect, RectangleF fromRect, NSCompositingOperation operation, float fractionDelta); + // void Draw (NSRect inRect, NSRect fromRect, NSCompositingOperation operation, float fractionDelta); // // [Export ("drawAtPoint:fromRect:operation:fraction:")] - // void DrawAtPoint (PointF atPoint, RectangleF fromRect, NSCompositingOperation operation, float fractionDelta); + // void DrawAtPoint (NSPoint atPoint, NSRect fromRect, NSCompositingOperation operation, float fractionDelta); //} [BaseType (typeof (NSCell))] @@ -67,7 +91,7 @@ public interface NSActionCell { Selector Action { get; set; } [Export ("tag")] - int Tag { get; set; } + NSInteger Tag { get; set; } } @@ -103,7 +127,7 @@ public interface NSAnimation { bool IsAnimating (); [Export ("currentProgress")] - float CurrentProgress { get; set; } + CGFloat CurrentProgress { get; set; } [Export ("duration")] double Duration { get; set; } @@ -112,13 +136,13 @@ public interface NSAnimation { NSAnimationBlockingMode AnimationBlockingMode { get; set; } [Export ("frameRate")] - float FrameRate { get; set; } + CGFloat FrameRate { get; set; } [Export ("animationCurve")] NSAnimationCurve AnimationCurve { get; set; } [Export ("currentValue")] - float CurrentValue { get; } + CGFloat CurrentValue { get; } [Export ("delegate")] NSAnimationDelegate Delegate { get; set; } @@ -127,16 +151,16 @@ public interface NSAnimation { NSNumber [] ProgressMarks { get; set; } [Export ("addProgressMark:")] - void AddProgressMark (float progressMark); + void AddProgressMark (CGFloat progressMark); [Export ("removeProgressMark:")] - void RemoveProgressMark (float progressMark); + void RemoveProgressMark (CGFloat progressMark); [Export ("startWhenAnimation:reachesProgress:")] - void StartWhenAnimationReaches (NSAnimation animation, float startProgress); + void StartWhenAnimationReaches (NSAnimation animation, CGFloat startProgress); [Export ("stopWhenAnimation:reachesProgress:")] - void StopWhenAnimationReaches (NSAnimation animation, float stopProgress); + void StopWhenAnimationReaches (NSAnimation animation, CGFloat stopProgress); [Export ("clearStartAnimation")] void ClearStartAnimation (); @@ -174,10 +198,10 @@ public interface NSAnimationDelegate { void AnimationDidEnd (NSAnimation animation); [Export ("animation:valueForProgress:"), DelegateName ("NSAnimationProgress"), DefaultValueFromArgumentAttribute ("progress")] - float ComputeAnimationCurve (NSAnimation animation, float progress); + CGFloat ComputeAnimationCurve (NSAnimation animation, CGFloat progress); [Export ("animation:didReachProgressMark:"), EventArgs ("NSAnimation")] - void AnimationDidReachProgressMark (NSAnimation animation, float progress); + void AnimationDidReachProgressMark (NSAnimation animation, CGFloat progress); } [BaseType (typeof (NSObject))] @@ -257,7 +281,7 @@ public interface NSAlert { void Layout (); [Export ("runModal")] - int RunModal (); + NSInteger RunModal (); [Export ("beginSheetModalForWindow:modalDelegate:didEndSelector:contextInfo:")] void BeginSheet ([NullAllowed] NSWindow window, [NullAllowed] NSObject modalDelegate, [NullAllowed] Selector didEndSelector, IntPtr contextInfo); @@ -299,7 +323,7 @@ public interface NSApplication : NSWindowRestoration { void UnhideWithoutActivation (); [Export ("windowWithWindowNumber:")] - NSWindow WindowWithWindowNumber (int windowNum); + NSWindow WindowWithWindowNumber (NSInteger windowNum); [Export ("mainWindow")] NSWindow MainWindow { get; } @@ -335,7 +359,7 @@ public interface NSApplication : NSWindowRestoration { void Run (); [Export ("runModalForWindow:")] - int RunModalForWindow (NSWindow theWindow); + NSInteger RunModalForWindow (NSWindow theWindow); [Export ("stop:")] void Stop (NSObject sender); @@ -344,7 +368,7 @@ public interface NSApplication : NSWindowRestoration { void StopModal (); [Export ("stopModalWithCode:")] - void StopModalWithCode (int returnCode); + void StopModalWithCode (NSInteger returnCode); [Export ("abortModal")] void AbortModal (); @@ -356,7 +380,7 @@ public interface NSApplication : NSWindowRestoration { IntPtr BeginModalSession (NSWindow theWindow); [Export ("runModalSession:")] - int RunModalSession (IntPtr session); + NSInteger RunModalSession (IntPtr session); [Export ("endModalSession:")] void EndModalSession (IntPtr session); @@ -365,10 +389,10 @@ public interface NSApplication : NSWindowRestoration { void Terminate (NSObject sender); [Export ("requestUserAttention:")] - int RequestUserAttention (NSRequestUserAttentionType requestType); + NSInteger RequestUserAttention (NSRequestUserAttentionType requestType); [Export ("cancelUserAttentionRequest:")] - void CancelUserAttentionRequest (int request); + void CancelUserAttentionRequest (NSInteger request); [Export ("beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:")] void BeginSheet (NSWindow sheet, NSWindow docWindow, [NullAllowed] NSObject modalDelegate, [NullAllowed] Selector didEndSelector, IntPtr contextInfo); @@ -377,13 +401,13 @@ public interface NSApplication : NSWindowRestoration { void EndSheet (NSWindow sheet); [Export ("endSheet:returnCode:")] - void EndSheet (NSWindow sheet, int returnCode); + void EndSheet (NSWindow sheet, NSInteger returnCode); [Export ("nextEventMatchingMask:untilDate:inMode:dequeue:"), Protected] - NSEvent NextEvent (uint mask, NSDate expiration, string mode, bool deqFlag); + NSEvent NextEvent (NSUInteger mask, NSDate expiration, string mode, bool deqFlag); [Export ("discardEventsMatchingMask:beforeEvent:"), Protected] - void DiscardEvents (uint mask, NSEvent lastEvent); + void DiscardEvents (NSUInteger mask, NSEvent lastEvent); [ThreadSafe] [Export ("postEvent:atStart:")] @@ -748,13 +772,13 @@ public interface NSArrayController { void AddObjects (NSArray objects); [Export ("insertObject:atArrangedObjectIndex:")] - void Insert (NSObject aObject, int index); + void Insert (NSObject aObject, NSInteger index); [Export ("insertObjects:atArrangedObjectIndexes:")] void Insert (NSObject [] objects, NSIndexSet indexes); [Export ("removeObjectAtArrangedObjectIndex:")] - void RemoveAt (int index); + void RemoveAt (NSInteger index); [Export ("removeObjectsAtArrangedObjectIndexes:")] void Remove (NSIndexSet indexes); @@ -797,10 +821,10 @@ public interface NSArrayController { bool SetSelectionIndexes (NSIndexSet indexes); [Export ("selectionIndex"), Protected] - uint GetSelectionIndex (); + NSUInteger GetSelectionIndex (); [Export ("setSelectionIndex:"), Protected] - bool SetSelectionIndex (uint index); + bool SetSelectionIndex (NSUInteger index); [Export ("selectedObjects"), Protected] NSObject [] GetSelectedObjects (); @@ -814,45 +838,45 @@ public interface NSBezierPath { [Static] [Export ("bezierPathWithRect:")] - NSBezierPath FromRect (RectangleF rect); + NSBezierPath FromRect (NSRect rect); [Static] [Export ("bezierPathWithOvalInRect:")] - NSBezierPath FromOvalInRect (RectangleF rect); + NSBezierPath FromOvalInRect (NSRect rect); [Static] [Export ("bezierPathWithRoundedRect:xRadius:yRadius:")] - NSBezierPath FromRoundedRect (RectangleF rect, float xRadius, float yRadius); + NSBezierPath FromRoundedRect (NSRect rect, CGFloat xRadius, CGFloat yRadius); [Static] [Export ("fillRect:")] - void FillRect (RectangleF rect); + void FillRect (NSRect rect); [Static] [Export ("strokeRect:")] - void StrokeRect (RectangleF rect); + void StrokeRect (NSRect rect); [Static] [Export ("clipRect:")] - void ClipRect (RectangleF rect); + void ClipRect (NSRect rect); [Static] [Export ("strokeLineFromPoint:toPoint:")] - void StrokeLine (PointF point1, PointF point2); + void StrokeLine (NSPoint point1, NSPoint point2); //IntPtr is exposed because the packedGlyphs should be treated as a "black box" [Static] [Export ("drawPackedGlyphs:atPoint:")] - void DrawPackedGlyphsAtPoint (IntPtr packedGlyphs, PointF point); + void DrawPackedGlyphsAtPoint (IntPtr packedGlyphs, NSPoint point); [Export ("moveToPoint:")] - void MoveTo (PointF point); + void MoveTo (NSPoint point); [Export ("lineToPoint:")] - void LineTo (PointF point); + void LineTo (NSPoint point); [Export ("curveToPoint:controlPoint1:controlPoint2:")] - void CurveTo (PointF endPoint, PointF controlPoint1, PointF controlPoint2); + void CurveTo (NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2); [Export ("closePath")] void ClosePath (); @@ -861,19 +885,19 @@ public interface NSBezierPath { void RemoveAllPoints (); [Export ("relativeMoveToPoint:")] - void RelativeMoveTo (PointF point); + void RelativeMoveTo (NSPoint point); [Export ("relativeLineToPoint:")] - void RelativeLineTo (PointF point); + void RelativeLineTo (NSPoint point); [Export ("relativeCurveToPoint:controlPoint1:controlPoint2:")] - void RelativeCurveTo (PointF endPoint, PointF controlPoint1, PointF controlPoint2); + void RelativeCurveTo (NSPoint endPoint, NSPoint controlPoint1, NSPoint controlPoint2); [Export ("getLineDash:count:phase:"), Internal] - void _GetLineDash (IntPtr pattern, out int count, out float phase); + void _GetLineDash (IntPtr pattern, out NSInteger count, out CGFloat phase); [Export ("setLineDash:count:phase:"), Internal] - void _SetLineDash (IntPtr pattern, int count, float phase); + void _SetLineDash (IntPtr pattern, NSInteger count, CGFloat phase); [Export ("stroke")] void Stroke (); @@ -900,71 +924,71 @@ public interface NSBezierPath { bool IsEmpty { get; } [Export ("currentPoint")] - PointF CurrentPoint { get; } + NSPoint CurrentPoint { get; } [Export ("controlPointBounds")] - RectangleF ControlPointBounds { get; } + NSRect ControlPointBounds { get; } [Export ("bounds")] - RectangleF Bounds { get; } + NSRect Bounds { get; } [Export ("elementCount")] - int ElementCount { get; } + NSInteger ElementCount { get; } [Export ("elementAtIndex:associatedPoints:"), Internal] - NSBezierPathElement _ElementAt (int index, IntPtr points); + NSBezierPathElement _ElementAt (NSInteger index, IntPtr points); [Export ("elementAtIndex:")] - NSBezierPathElement ElementAt (int index); + NSBezierPathElement ElementAt (NSInteger index); [Export ("setAssociatedPoints:atIndex:"), Internal] - void _SetAssociatedPointsAtIndex (IntPtr points, int index); + void _SetAssociatedPointsAtIndex (IntPtr points, NSInteger index); [Export ("appendBezierPath:")] void AppendPath (NSBezierPath path); [Export ("appendBezierPathWithRect:")] - void AppendPathWithRect (RectangleF rect); + void AppendPathWithRect (NSRect rect); [Export ("appendBezierPathWithPoints:count:"), Internal] - void _AppendPathWithPoints (IntPtr points, int count); + void _AppendPathWithPoints (IntPtr points, NSInteger count); [Export ("appendBezierPathWithOvalInRect:")] - void AppendPathWithOvalInRect (RectangleF rect); + void AppendPathWithOvalInRect (NSRect rect); [Export ("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:")] - void AppendPathWithArc (PointF center, float radius, float startAngle, float endAngle, bool clockwise); + void AppendPathWithArc (NSPoint center, CGFloat radius, CGFloat startAngle, CGFloat endAngle, bool clockwise); [Export ("appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:")] - void AppendPathWithArc (PointF center, float radius, float startAngle, float endAngle); + void AppendPathWithArc (NSPoint center, CGFloat radius, CGFloat startAngle, CGFloat endAngle); [Export ("appendBezierPathWithArcFromPoint:toPoint:radius:")] - void AppendPathWithArc (PointF point1, PointF point2, float radius); + void AppendPathWithArc (NSPoint point1, NSPoint point2, CGFloat radius); [Export ("appendBezierPathWithGlyph:inFont:")] - void AppendPathWithGlyph (uint glyph, NSFont font); + void AppendPathWithGlyph (NSUInteger glyph, NSFont font); [Export ("appendBezierPathWithGlyphs:count:inFont:"), Internal] - void _AppendPathWithGlyphs (IntPtr glyphs, int count, NSFont font); + void _AppendPathWithGlyphs (IntPtr glyphs, NSInteger count, NSFont font); //IntPtr is exposed because the packedGlyphs should be treated as a "black box" [Export ("appendBezierPathWithPackedGlyphs:")] void AppendPathWithPackedGlyphs (IntPtr packedGlyphs); [Export ("appendBezierPathWithRoundedRect:xRadius:yRadius:")] - void AppendPathWithRoundedRect (RectangleF rect, float xRadius, float yRadius); + void AppendPathWithRoundedRect (NSRect rect, CGFloat xRadius, CGFloat yRadius); [Export ("containsPoint:")] - bool Contains (PointF point); + bool Contains (NSPoint point); //Detected properties [Static] [Export ("defaultMiterLimit")] - float DefaultMiterLimit { get; set; } + CGFloat DefaultMiterLimit { get; set; } [Static] [Export ("defaultFlatness")] - float DefaultFlatness { get; set; } + CGFloat DefaultFlatness { get; set; } [Static] [Export ("defaultWindingRule")] @@ -980,10 +1004,10 @@ public interface NSBezierPath { [Static] [Export ("defaultLineWidth")] - float DefaultLineWidth { get; set; } + CGFloat DefaultLineWidth { get; set; } [Export ("lineWidth")] - float LineWidth { get; set; } + CGFloat LineWidth { get; set; } [Export ("lineCapStyle")] NSLineCapStyle LineCapStyle { get; set; } @@ -995,10 +1019,10 @@ public interface NSBezierPath { NSWindingRule WindingRule { get; set; } [Export ("miterLimit")] - float MiterLimit { get; set; } + CGFloat MiterLimit { get; set; } [Export ("flatness")] - float Flatness { get; set; } + CGFloat Flatness { get; set; } } @@ -1006,15 +1030,15 @@ public interface NSBezierPath { [DisableDefaultCtor] // An uncaught exception was raised: -[NSBitmapImageRep init]: unrecognized selector sent to instance 0x686880 public partial interface NSBitmapImageRep { [Export ("initWithFocusedViewRect:")] - IntPtr Constructor (RectangleF rect); + IntPtr Constructor (NSRect rect); [Export ("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bytesPerRow:bitsPerPixel:")] - IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool alpha, bool isPlanar, - string colorSpaceName, int rBytes, int pBits); + IntPtr Constructor (IntPtr planes, NSInteger width, NSInteger height, NSInteger bps, NSInteger spp, bool alpha, bool isPlanar, + string colorSpaceName, NSInteger rBytes, NSInteger pBits); [Export ("initWithBitmapDataPlanes:pixelsWide:pixelsHigh:bitsPerSample:samplesPerPixel:hasAlpha:isPlanar:colorSpaceName:bitmapFormat:bytesPerRow:bitsPerPixel:")] - IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool alpha, bool isPlanar, string colorSpaceName, - NSBitmapFormat bitmapFormat, int rBytes, int pBits); + IntPtr Constructor (IntPtr planes, NSInteger width, NSInteger height, NSInteger bps, NSInteger spp, bool alpha, bool isPlanar, string colorSpaceName, + NSBitmapFormat bitmapFormat, NSInteger rBytes, NSInteger pBits); [Export ("initWithCGImage:")] IntPtr Constructor (CGImage cgImage); @@ -1043,34 +1067,34 @@ IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool bool IsPlanar { get; } [Export ("samplesPerPixel")] - int SamplesPerPixel { get; } + NSInteger SamplesPerPixel { get; } [Export ("bitsPerPixel")] - int BitsPerPixel { get; } + NSInteger BitsPerPixel { get; } [Export ("bytesPerRow")] - int BytesPerRow { get; } + NSInteger BytesPerRow { get; } [Export ("bytesPerPlane")] - int BytesPerPlane { get; } + NSInteger BytesPerPlane { get; } [Export ("numberOfPlanes")] - int Planes { get; } + NSInteger Planes { get; } [Export ("bitmapFormat")] NSBitmapFormat BitmapFormat { get; } [Export ("getCompression:factor:")] - void GetCompressionFactor (out NSTiffCompression compression, out float factor); + void GetCompressionFactor (out NSTiffCompression compression, out CGFloat factor); [Export ("setCompression:factor:")] - void SetCompressionFactor (NSTiffCompression compression, float factor); + void SetCompressionFactor (NSTiffCompression compression, CGFloat factor); [Export ("TIFFRepresentation")] NSData TiffRepresentation { get; } [Export ("TIFFRepresentationUsingCompression:factor:")] - NSData TiffRepresentationUsingCompressionFactor (NSTiffCompression comp, float factor); + NSData TiffRepresentationUsingCompressionFactor (NSTiffCompression comp, CGFloat factor); [Static] [Export ("TIFFRepresentationOfImageRepsInArray:")] @@ -1078,7 +1102,7 @@ IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool [Static] [Export ("TIFFRepresentationOfImageRepsInArray:usingCompression:factor:")] - NSData ImagesAsTiff (NSImageRep [] imageReps, NSTiffCompression comp, float factor); + NSData ImagesAsTiff (NSImageRep [] imageReps, NSTiffCompression comp, CGFloat factor); // FIXME: binding //[Static] @@ -1093,16 +1117,16 @@ IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool bool CanBeCompressedUsing (NSTiffCompression compression); [Export ("colorizeByMappingGray:toColor:blackMapping:whiteMapping:")] - void Colorize (float midPoint, NSColor midPointColor, NSColor shadowColor, NSColor lightColor); + void Colorize (CGFloat midPoint, NSColor midPointColor, NSColor shadowColor, NSColor lightColor); [Export ("incrementalLoadFromData:complete:")] - int IncrementalLoad (NSData data, bool complete); + NSInteger IncrementalLoad (NSData data, bool complete); [Export ("setColor:atX:y:")] - void SetColorAt (NSColor color, int x, int y); + void SetColorAt (NSColor color, NSInteger x, NSInteger y); [Export ("colorAtX:y:")] - NSColor ColorAt (int x, int y); + NSColor ColorAt (NSInteger x, NSInteger y); // FIXME: BINDING //[Export ("getPixel:atX:y:")] @@ -1171,7 +1195,7 @@ IntPtr Constructor (IntPtr planes, int width, int height, int bps, int spp, bool [BaseType (typeof (NSView))] public interface NSBox { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("borderType")] NSBorderType BorderType { get; set; } @@ -1189,10 +1213,10 @@ public interface NSBox { NSFont TitleFont { get; set; } [Export ("borderRect")] - RectangleF BorderRect { get; } + NSRect BorderRect { get; } [Export ("titleRect")] - RectangleF TitleRect { get; } + NSRect TitleRect { get; } [Export ("titleCell")] NSObject TitleCell { get; } @@ -1201,10 +1225,10 @@ public interface NSBox { void SizeToFit (); [Export ("contentViewMargins")] - SizeF ContentViewMargins { get; set; } + NSSize ContentViewMargins { get; set; } [Export ("setFrameFromContentFrame:")] - void SetFrameFromContentFrame (RectangleF contentFrame); + void SetFrameFromContentFrame (NSRect contentFrame); [Export ("contentView")] NSObject ContentView { get; set; } @@ -1216,10 +1240,10 @@ public interface NSBox { void SetTitleWithMnemonic (string stringWithMnemonic); [Export ("borderWidth")] - float BorderWidth { get; set; } + CGFloat BorderWidth { get; set; } [Export ("cornerRadius")] - float CornerRadius { get; set; } + CGFloat CornerRadius { get; set; } [Export ("borderColor")] NSColor BorderColor { get; set; } @@ -1232,7 +1256,7 @@ public interface NSBox { // , Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSBrowserDelegate)})] public partial interface NSBrowser { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("loadColumnZero")] void LoadColumnZero (); @@ -1247,55 +1271,55 @@ public partial interface NSBrowser { NSObject ItemAtIndexPath (NSIndexPath indexPath); [Export ("itemAtRow:inColumn:")] - NSObject GetItem (int row, int column); + NSObject GetItem (NSInteger row, NSInteger column); [Export ("indexPathForColumn:")] - NSIndexPath IndexPathForColumn (int column); + NSIndexPath IndexPathForColumn (NSInteger column); [Export ("isLeafItem:")] bool IsLeafItem (NSObject item); [Export ("reloadDataForRowIndexes:inColumn:")] - void ReloadData (NSIndexSet rowIndexes, int column); + void ReloadData (NSIndexSet rowIndexes, NSInteger column); [Export ("parentForItemsInColumn:")] - NSObject ParentForItems (int column); + NSObject ParentForItems (NSInteger column); [Export ("scrollRowToVisible:inColumn:")] - void ScrollRowToVisible (int row, int column); + void ScrollRowToVisible (NSInteger row, NSInteger column); [Export ("setTitle:ofColumn:")] - void SetTitle (string aString, int column); + void SetTitle (string aString, NSInteger column); [Export ("titleOfColumn:")] - string ColumnTitle (int column); + string ColumnTitle (NSInteger column); [Export ("pathToColumn:")] - string ColumnPath (int column); + string ColumnPath (NSInteger column); [Export ("clickedColumn")] - int ClickedColumn (); + NSInteger ClickedColumn (); [Export ("clickedRow")] - int ClickedRow (); + NSInteger ClickedRow (); [Export ("selectedColumn")] - int SelectedColumn (); + NSInteger SelectedColumn (); [Export ("selectedCell")] NSObject SelectedCell (); [Export ("selectedCellInColumn:")] - NSObject SelectedCellInColumn (int column); + NSObject SelectedCellInColumn (NSInteger column); [Export ("selectedCells")] NSCell [] SelectedCells (); [Export ("selectRow:inColumn:")] - void Select (int row, int column); + void Select (NSInteger row, NSInteger column); [Export ("selectedRowInColumn:")] - int SelectedRow (int column); + NSInteger SelectedRow (NSInteger column); [Export ("selectionIndexPath")] NSIndexPath SelectionIndexPath { get; set; } @@ -1304,46 +1328,46 @@ public partial interface NSBrowser { NSIndexPath [] SelectionIndexPaths { get; set; } [Export ("selectRowIndexes:inColumn:")] - void SelectRowIndexes (NSIndexSet indexes, int column); + void SelectRowIndexes (NSIndexSet indexes, NSInteger column); [Export ("selectedRowIndexesInColumn:")] - NSIndexSet SelectedRowIndexes (int column); + NSIndexSet SelectedRowIndexes (NSInteger column); [Export ("reloadColumn:")] - void ReloadColumn (int column); + void ReloadColumn (NSInteger column); [Export ("validateVisibleColumns")] void ValidateVisibleColumns (); [Export ("scrollColumnsRightBy:")] - void ScrollColumnsRightBy (int shiftAmount); + void ScrollColumnsRightBy (NSInteger shiftAmount); [Export ("scrollColumnsLeftBy:")] - void ScrollColumnsLeftBy (int shiftAmount); + void ScrollColumnsLeftBy (NSInteger shiftAmount); [Export ("scrollColumnToVisible:")] - void ScrollColumnToVisible (int column); + void ScrollColumnToVisible (NSInteger column); [Export ("addColumn")] void AddColumn (); [Export ("numberOfVisibleColumns")] - int VisibleColumns { get; } + NSInteger VisibleColumns { get; } [Export ("firstVisibleColumn")] - int FirstVisibleColumn { get; } + NSInteger FirstVisibleColumn { get; } [Export ("lastVisibleColumn")] - int LastVisibleColumn { get; } + NSInteger LastVisibleColumn { get; } [Export ("columnOfMatrix:")] - int ColumnOfMatrix (NSMatrix matrix); + NSInteger ColumnOfMatrix (NSMatrix matrix); [Export ("matrixInColumn:")] - NSMatrix MatrixInColumn (int column); + NSMatrix MatrixInColumn (NSInteger column); [Export ("loadedCellAtRow:column:")] - NSCell LoadedCell (int row, int col); + NSCell LoadedCell (NSInteger row, NSInteger col); [Export ("selectAll:")] void SelectAll (NSObject sender); @@ -1361,31 +1385,31 @@ public partial interface NSBrowser { bool SendAction (); [Export ("titleFrameOfColumn:")] - RectangleF TitleFrameOfColumn (int column); + NSRect TitleFrameOfColumn (NSInteger column); [Export ("drawTitleOfColumn:inRect:")] - void DrawTitle (int column, RectangleF aRect); + void DrawTitle (NSInteger column, NSRect aRect); [Export ("titleHeight")] - float TitleHeight { get; } + CGFloat TitleHeight { get; } [Export ("frameOfColumn:")] - RectangleF ColumnFrame (int column); + NSRect ColumnFrame (NSInteger column); [Export ("frameOfInsideOfColumn:")] - RectangleF ColumnInsideFrame (int column); + NSRect ColumnInsideFrame (NSInteger column); [Export ("frameOfRow:inColumn:")] - RectangleF RowFrame (int row, int column); + NSRect RowFrame (NSInteger row, NSInteger column); [Export ("getRow:column:forPoint:")] - bool GetRowColumnForPoint (out int row, out int column, PointF point); + bool GetRowColumnForPoint (out NSInteger row, out NSInteger column, NSPoint point); [Export ("columnWidthForColumnContentWidth:")] - float ColumnWidthForColumnContentWidth (float columnContentWidth); + CGFloat ColumnWidthForColumnContentWidth (CGFloat columnContentWidth); [Export ("columnContentWidthForColumnWidth:")] - float ColumnContentWidthForColumnWidth (float columnWidth); + CGFloat ColumnContentWidthForColumnWidth (CGFloat columnWidth); [Export ("setColumnResizingType:")] void SetColumnResizingType (NSBrowserColumnResizingType columnResizingType); @@ -1397,19 +1421,19 @@ public partial interface NSBrowser { bool PrefersAllColumnUserResizing { get; set; } [Export ("setWidth:ofColumn:")] - void SetColumnWidth (float columnWidth, int columnIndex); + void SetColumnWidth (CGFloat columnWidth, NSInteger columnIndex); [Export ("widthOfColumn:")] - float GetColumnWidth (int column); + CGFloat GetColumnWidth (NSInteger column); [Export ("rowHeight")] - float RowHeight { get; set; } + CGFloat RowHeight { get; set; } [Export ("noteHeightOfRowsWithIndexesChanged:inColumn:")] - void NoteHeightOfRows (NSIndexSet indexSet, int columnIndex); + void NoteHeightOfRows (NSIndexSet indexSet, NSInteger columnIndex); [Export ("defaultColumnWidth")] - float DefaultColumnWidth { get; set; } + CGFloat DefaultColumnWidth { get; set; } [Export ("columnsAutosaveName")] string ColumnsAutosaveName { get; set; } @@ -1419,7 +1443,7 @@ public partial interface NSBrowser { void RemoveSavedColumnsWithAutosaveName (string name); [Export ("canDragRowsWithIndexes:inColumn:withEvent:")] - bool CanDragRowsWithIndexes (NSIndexSet rowIndexes, int column, NSEvent theEvent); + bool CanDragRowsWithIndexes (NSIndexSet rowIndexes, NSInteger column, NSEvent theEvent); // FIXME: binding, NSPointPointer //[Export ("draggingImageForRowsWithIndexes:inColumn:withEvent:offset:")] @@ -1470,10 +1494,10 @@ public partial interface NSBrowser { bool Titled { [Bind ("isTitled")]get; set; } [Export ("minColumnWidth")] - float MinColumnWidth { get; set; } + CGFloat MinColumnWidth { get; set; } [Export ("maxVisibleColumns")] - int MaxVisibleColumns { get; set; } + NSInteger MaxVisibleColumns { get; set; } [Export ("allowsMultipleSelection")] bool AllowsMultipleSelection { get; set; } @@ -1500,23 +1524,23 @@ public partial interface NSBrowser { bool SetPath (string path); [Export ("lastColumn")] - int LastColumn { get; set; } + NSInteger LastColumn { get; set; } } [BaseType (typeof (NSObject))] [Model] public interface NSBrowserDelegate { [Export ("browser:numberOfRowsInColumn:"), EventArgs ("NSBrowserColumn")] - int RowsInColumn (NSBrowser sender, int column); + NSInteger RowsInColumn (NSBrowser sender, NSInteger column); [Export ("browser:createRowsForColumn:inMatrix:")] - void CreateRowsForColumn (NSBrowser sender, int column, NSMatrix matrix); + void CreateRowsForColumn (NSBrowser sender, NSInteger column, NSMatrix matrix); [Export ("browser:numberOfChildrenOfItem:")] - int CountChildren (NSBrowser browser, NSObject item); + NSInteger CountChildren (NSBrowser browser, NSObject item); [Export ("browser:child:ofItem:")] - NSObject GetChild (NSBrowser browser, int index, NSObject item); + NSObject GetChild (NSBrowser browser, NSInteger index, NSObject item); [Export ("browser:isLeafItem:")] bool IsLeafItem (NSBrowser browser, NSObject item); @@ -1525,7 +1549,7 @@ public interface NSBrowserDelegate { NSObject ObjectValueForItem (NSBrowser browser, NSObject item); [Export ("browser:heightOfRow:inColumn:")] - float RowHeight (NSBrowser browser, int row, int columnIndex); + CGFloat RowHeight (NSBrowser browser, NSInteger row, NSInteger columnIndex); [Export ("rootItemForBrowser:")] NSObject RootItemForBrowser (NSBrowser browser); @@ -1537,19 +1561,19 @@ public interface NSBrowserDelegate { bool ShouldEditItem (NSBrowser browser, NSObject item); [Export ("browser:willDisplayCell:atRow:column:")] - void WillDisplayCell (NSBrowser sender, NSObject cell, int row, int column); + void WillDisplayCell (NSBrowser sender, NSObject cell, NSInteger row, NSInteger column); [Export ("browser:titleOfColumn:")] - string ColumnTitle (NSBrowser sender, int column); + string ColumnTitle (NSBrowser sender, NSInteger column); [Export ("browser:selectCellWithString:inColumn:")] - bool SelectCellWithString (NSBrowser sender, string title, int column); + bool SelectCellWithString (NSBrowser sender, string title, NSInteger column); [Export ("browser:selectRow:inColumn:")] - bool SelectRowInColumn (NSBrowser sender, int row, int column); + bool SelectRowInColumn (NSBrowser sender, NSInteger row, NSInteger column); [Export ("browser:isColumnValid:")] - bool IsColumnValid (NSBrowser sender, int column); + bool IsColumnValid (NSBrowser sender, NSInteger column); [Export ("browserWillScroll:")] void WillScroll (NSBrowser sender); @@ -1558,45 +1582,45 @@ public interface NSBrowserDelegate { void DidScroll (NSBrowser sender); [Export ("browser:shouldSizeColumn:forUserResize:toWidth:")] - float ShouldSizeColumn (NSBrowser browser, int columnIndex, bool userResize, float suggestedWidth); + CGFloat ShouldSizeColumn (NSBrowser browser, NSInteger columnIndex, bool userResize, CGFloat suggestedWidth); [Export ("browser:sizeToFitWidthOfColumn:")] - float SizeToFitWidth (NSBrowser browser, int columnIndex); + CGFloat SizeToFitWidth (NSBrowser browser, NSInteger columnIndex); [Export ("browserColumnConfigurationDidChange:")] void ColumnConfigurationDidChange (NSNotification notification); [Export ("browser:shouldShowCellExpansionForRow:column:")] - bool ShouldShowCellExpansion (NSBrowser browser, int row, int column); + bool ShouldShowCellExpansion (NSBrowser browser, NSInteger row, NSInteger column); [Export ("browser:writeRowsWithIndexes:inColumn:toPasteboard:")] - bool WriteRowsWithIndexesToPasteboard (NSBrowser browser, NSIndexSet rowIndexes, int column, NSPasteboard pasteboard); + bool WriteRowsWithIndexesToPasteboard (NSBrowser browser, NSIndexSet rowIndexes, NSInteger column, NSPasteboard pasteboard); [Export ("browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:")] - string [] PromisedFilesDroppedAtDestination (NSBrowser browser, NSUrl dropDestination, NSIndexSet rowIndexes, int column); + string [] PromisedFilesDroppedAtDestination (NSBrowser browser, NSUrl dropDestination, NSIndexSet rowIndexes, NSInteger column); [Export ("browser:canDragRowsWithIndexes:inColumn:withEvent:")] - bool CanDragRowsWithIndexes (NSBrowser browser, NSIndexSet rowIndexes, int column, NSEvent theEvent); + bool CanDragRowsWithIndexes (NSBrowser browser, NSIndexSet rowIndexes, NSInteger column, NSEvent theEvent); - // FIXME: NSPOintPointer is a pointer to a PointF, so we need to support refs + // FIXME: NSPOintPointer is a pointer to a NSPoint, so we need to support refs //[Export ("browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:")] //NSImage DraggingImageForRowsWithIndexes (NSBrowser browser, NSIndexSet rowIndexes, int column, NSEvent theEvent, NSPointPointer dragImageOffset); [Export ("browser:validateDrop:proposedRow:column:dropOperation:")] //FIXME: NSBrowserDropOperation is also a ref (in/out) parameter - NSDragOperation ValidateDrop (NSBrowser browser, NSDraggingInfo info, ref int row, ref int column, NSBrowserDropOperation dropOperation); + NSDragOperation ValidateDrop (NSBrowser browser, NSDraggingInfo info, ref NSInteger row, ref NSInteger column, NSBrowserDropOperation dropOperation); [Export ("browser:acceptDrop:atRow:column:dropOperation:")] - bool AcceptDrop (NSBrowser browser, NSDraggingInfo info, int row, int column, NSBrowserDropOperation dropOperation); + bool AcceptDrop (NSBrowser browser, NSDraggingInfo info, NSInteger row, NSInteger column, NSBrowserDropOperation dropOperation); [Export ("browser:typeSelectStringForRow:inColumn:")] - string TypeSelectString (NSBrowser browser, int row, int column); + string TypeSelectString (NSBrowser browser, NSInteger row, NSInteger column); [Export ("browser:shouldTypeSelectForEvent:withCurrentSearchString:")] bool ShouldTypeSelectForEvent (NSBrowser browser, NSEvent theEvent, string currentSearchString); [Export ("browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:")] - int NextTypeSelectMatch (NSBrowser browser, int startRow, int endRow, int column, string searchString); + NSInteger NextTypeSelectMatch (NSBrowser browser, NSInteger startRow, NSInteger endRow, NSInteger column, string searchString); [Export ("browser:previewViewControllerForLeafItem:")] NSViewController PreviewViewControllerForLeafItem (NSBrowser browser, NSObject item); @@ -1605,10 +1629,10 @@ public interface NSBrowserDelegate { NSViewController HeaderViewControllerForItem (NSBrowser browser, NSObject item); [Export ("browser:didChangeLastColumn:toColumn:")] - void DidChangeLastColumn (NSBrowser browser, int oldLastColumn, int toColumn); + void DidChangeLastColumn (NSBrowser browser, NSInteger oldLastColumn, NSInteger toColumn); [Export ("browser:selectionIndexesForProposedSelection:inColumn:")] - NSIndexSet SelectionIndexesForProposedSelection (NSBrowser browser, NSIndexSet proposedSelectionIndexes, int inColumn); + NSIndexSet SelectionIndexesForProposedSelection (NSBrowser browser, NSIndexSet proposedSelectionIndexes, NSInteger inColumn); } @@ -1670,13 +1694,13 @@ public interface NSButtonCell { NSImageScale ImageScale { get; set; } [Export ("highlightsBy")] - int HighlightsBy { get; set; } + NSInteger HighlightsBy { get; set; } [Export ("showsStateBy")] - int ShowsStateBy { get; set; } + NSInteger ShowsStateBy { get; set; } [Export ("setShowsStateBy:")] - void SetShowsStateBy (int aType); + void SetShowsStateBy (NSInteger aType); [Export ("setButtonType:")] void SetButtonType (NSButtonType aType); @@ -1706,19 +1730,19 @@ public interface NSButtonCell { NSFont KeyEquivalentFont { get; set; } [Export ("setKeyEquivalentFont:size:")] - void SetKeyEquivalentFont (string fontName, float fontSize); + void SetKeyEquivalentFont (string fontName, CGFloat fontSize); [Export ("performClick:")] void PerformClick (NSObject sender); [Export ("drawImage:withFrame:inView:")] - void DrawImage (NSImage image, RectangleF frame, NSView controlView); + void DrawImage (NSImage image, NSRect frame, NSView controlView); [Export ("drawTitle:withFrame:inView:")] - RectangleF DrawTitle (NSAttributedString title, RectangleF frame, NSView controlView); + NSRect DrawTitle (NSAttributedString title, NSRect frame, NSView controlView); [Export ("drawBezelWithFrame:inView:")] - void DrawBezelWithFrame (RectangleF frame, NSView controlView); + void DrawBezelWithFrame (NSRect frame, NSView controlView); [Export ("alternateMnemonicLocation")] int AlternateMnemonicLocation { get; set; } @@ -1757,11 +1781,12 @@ public interface NSButtonCell { NSSound Sound { get; set; } } - + + // 64 Bit reviewed [BaseType (typeof (NSControl))] public interface NSButton { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("title")] string Title { get; set; } @@ -1838,11 +1863,11 @@ public interface NSButton { public interface NSCachedImageRep { [Obsolete ("Deprecated in OSX 10.6")] [Export ("initWithIdentifier:")] - IntPtr Constructor (NSWindow win, RectangleF rect); + IntPtr Constructor (NSWindow win, NSRect rect); [Obsolete ("Deprecated in OSX 10.6")] [Export ("initWithSize:depth:separate:alpha:")] - IntPtr Constructor (SizeF size, NSWindowDepth depth, bool separate, bool alpha); + IntPtr Constructor (NSSize size, NSWindowDepth depth, bool separate, bool alpha); [Obsolete ("Deprecated in OSX 10.6")] [Export ("window")] @@ -1850,7 +1875,7 @@ public interface NSCachedImageRep { [Obsolete ("Deprecated in OSX 10.6")] [Export ("rect")] - RectangleF Rectangle { get; } + NSRect Rectangle { get; } } [BaseType (typeof (NSObject))] @@ -1880,7 +1905,7 @@ public interface NSCell : NSUserInterfaceItemIdentification { Selector Action { get; set; } [Export ("tag")] - int Tag { get; set; } + NSInteger Tag { get; set; } [Export ("title")] string Title { get; set; } @@ -1892,7 +1917,7 @@ public interface NSCell : NSUserInterfaceItemIdentification { bool Enabled { [Bind ("isEnabled")] get; set; } [Export ("sendActionOn:")] - int SendActionOn (NSEventType mask); + NSInteger SendActionOn (NSEventType mask); [Export ("continuous")] bool IsContinuous { [Bind ("isContinuous")] get; set; } @@ -1982,79 +2007,79 @@ public interface NSCell : NSUserInterfaceItemIdentification { NSObject RepresentedObject { get; set; } [Export ("cellAttribute:")] - int CellAttribute (NSCellAttribute aParameter); + NSInteger CellAttribute (NSCellAttribute aParameter); [Export ("setCellAttribute:to:")] - void SetCellAttribute (NSCellAttribute aParameter, int value); + void SetCellAttribute (NSCellAttribute aParameter, NSInteger value); [Export ("imageRectForBounds:")] - RectangleF ImageRectForBounds (RectangleF theRect); + NSRect ImageRectForBounds (NSRect theRect); [Export ("titleRectForBounds:")] - RectangleF TitleRectForBounds (RectangleF theRect); + NSRect TitleRectForBounds (NSRect theRect); [Export ("drawingRectForBounds:")] - RectangleF DrawingRectForBounds (RectangleF theRect); + NSRect DrawingRectForBounds (NSRect theRect); [Export ("cellSize")] - SizeF CellSize { get; } + NSSize CellSize { get; } [Export ("cellSizeForBounds:")] - SizeF CellSizeForBounds (RectangleF bounds); + NSSize CellSizeForBounds (NSRect bounds); [Export ("highlightColorWithFrame:inView:")] - NSColor HighlightColor (RectangleF cellFrame, NSView controlView); + NSColor HighlightColor (NSRect cellFrame, NSView controlView); [Export ("calcDrawInfo:")] - void CalcDrawInfo (RectangleF aRect); + void CalcDrawInfo (NSRect aRect); [Export ("setUpFieldEditorAttributes:")] NSText SetUpFieldEditorAttributes (NSText textObj); [Export ("drawInteriorWithFrame:inView:")] - void DrawInteriorWithFrame (RectangleF cellFrame, NSView inView); + void DrawInteriorWithFrame (NSRect cellFrame, NSView inView); [Export ("drawWithFrame:inView:")] - void DrawWithFrame (RectangleF cellFrame, NSView inView); + void DrawWithFrame (NSRect cellFrame, NSView inView); [Export ("highlight:withFrame:inView:")] - void Highlight (bool highlight, RectangleF withFrame, NSView inView); + void Highlight (bool highlight, NSRect withFrame, NSView inView); [Export ("mouseDownFlags")] - int MouseDownFlags { get; } + NSInteger MouseDownFlags { get; } [Export ("getPeriodicDelay:interval:")] - void GetPeriodicDelay (ref float delay, ref float interval); + void GetPeriodicDelay (ref CGFloat delay, ref CGFloat interval); [Export ("startTrackingAt:inView:")] - bool StartTracking (PointF startPoint, NSView inView); + bool StartTracking (NSPoint startPoint, NSView inView); [Export ("continueTracking:at:inView:")] - bool ContinueTracking (PointF lastPoint, PointF currentPoint, NSView inView); + bool ContinueTracking (NSPoint lastPoint, NSPoint currentPoint, NSView inView); [Export ("stopTracking:at:inView:mouseIsUp:")] - void StopTracking (PointF lastPoint, PointF stopPoint, NSView inView, bool mouseIsUp); + void StopTracking (NSPoint lastPoint, NSPoint stopPoint, NSView inView, bool mouseIsUp); [Export ("trackMouse:inRect:ofView:untilMouseUp:")] - bool TrackMouse (NSEvent theEvent, RectangleF cellFrame, NSView controlView, bool untilMouseUp); + bool TrackMouse (NSEvent theEvent, NSRect cellFrame, NSView controlView, bool untilMouseUp); [Export ("editWithFrame:inView:editor:delegate:event:")] - void EditWithFrame (RectangleF aRect, NSView inView, NSText editor, NSObject delegateObject, NSEvent theEvent); + void EditWithFrame (NSRect aRect, NSView inView, NSText editor, NSObject delegateObject, NSEvent theEvent); [Export ("selectWithFrame:inView:editor:delegate:start:length:")] - void SelectWithFrame (RectangleF aRect, NSView inView, NSText editor, NSObject delegateObject, int selStart, int selLength); + void SelectWithFrame (NSRect aRect, NSView inView, NSText editor, NSObject delegateObject, NSInteger selStart, NSInteger selLength); [Export ("endEditing:")] void EndEditing (NSText textObj); [Export ("resetCursorRect:inView:")] - void ResetCursorRect (RectangleF cellFrame, NSView inView); + void ResetCursorRect (NSRect cellFrame, NSView inView); [Export ("menu")] NSMenu Menu { get; set; } [Export ("menuForEvent:inRect:ofView:")] - NSMenu MenuForEvent (NSEvent theEvent, RectangleF cellFrame, NSView view); + NSMenu MenuForEvent (NSEvent theEvent, NSRect cellFrame, NSView view); [Static] [Export ("defaultMenu")] @@ -2076,7 +2101,7 @@ public interface NSCell : NSUserInterfaceItemIdentification { bool AllowsUndo { get; set; } [Export ("integerValue")] - int IntegerValue { get; set; } + NSInteger IntegerValue { get; set; } [Export ("takeIntegerValueFrom:")] void TakeIntegerValueFrom (NSObject sender); @@ -2104,7 +2129,7 @@ public interface NSCell : NSUserInterfaceItemIdentification { bool ShowsFirstResponder { get; set; } [Export ("mnemonicLocation")] - int MnemonicLocation { get; set; } + NSInteger MnemonicLocation { get; set; } [Export ("mnemonic")] string Mnemonic { get; } @@ -2139,21 +2164,21 @@ public interface NSCell : NSUserInterfaceItemIdentification { bool AllowsMixedState { get; set; } [Export ("nextState")] - int NextState { get; } + NSInteger NextState { get; } [Export ("setNextState")] void SetNextState (); // [Export ("hitTestForEvent:inRect:ofView:")] - NSCellHit HitTest (NSEvent forEvent, RectangleF inRect, NSView ofView); + NSCellHit HitTest (NSEvent forEvent, NSRect inRect, NSView ofView); // NSCell(NSCellExpansion) [Export ("expansionFrameWithFrame:inView:")] - RectangleF ExpansionFrame (RectangleF withFrame, NSView inView); + NSRect ExpansionFrame (NSRect withFrame, NSView inView); [Export ("drawWithExpansionFrame:inView:")] - void DrawWithExpansionFrame (RectangleF cellFrame, NSView inView); + void DrawWithExpansionFrame (NSRect cellFrame, NSView inView); [Export ("backgroundStyle")] NSBackgroundStyle BackgroundStyle { get; set; } @@ -2162,13 +2187,13 @@ public interface NSCell : NSUserInterfaceItemIdentification { NSBackgroundStyle InteriorBackgroundStyle { get; } [Lion, Export ("draggingImageComponentsWithFrame:inView:")] - NSDraggingImageComponent [] GenerateDraggingImageComponents (RectangleF frame, NSView view); + NSDraggingImageComponent [] GenerateDraggingImageComponents (NSRect frame, NSView view); [Lion, Export ("drawFocusRingMaskWithFrame:inView:")] - void DrawFocusRing (RectangleF cellFrameMask, NSView inControlView); + void DrawFocusRing (NSRect cellFrameMask, NSView inControlView); [Lion, Export ("focusRingMaskBoundsForFrame:inView:")] - RectangleF GetFocusRingMaskBounds (RectangleF cellFrame, NSView controlView); + NSRect GetFocusRingMaskBounds (NSRect cellFrame, NSView controlView); } [BaseType (typeof (NSImageRep))] @@ -2188,7 +2213,7 @@ public interface NSCIImageRep { [BaseType (typeof (NSView))] public interface NSClipView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("backgroundColor")] NSColor BackgroundColor { get; set; } @@ -2200,13 +2225,13 @@ public interface NSClipView { NSView DocumentView { get; set; } [Export ("documentRect")] - RectangleF DocumentRect { get; } + NSRect DocumentRect { get; } [Export ("documentCursor")] NSCursor DocumentCursor { get; set; } [Export ("documentVisibleRect")] - RectangleF DocumentVisibleRect (); + NSRect DocumentVisibleRect (); [Export ("viewFrameChanged:")] void ViewFrameChanged (NSNotification notification); @@ -2221,13 +2246,13 @@ public interface NSClipView { bool Autoscroll (NSEvent theEvent); [Export ("constrainScrollPoint:")] - PointF ConstrainScrollPoint (PointF newOrigin); + NSPoint ConstrainScrollPoint (NSPoint newOrigin); [Export ("scrollToPoint:")] - void ScrollToPoint (PointF newOrigin); + void ScrollToPoint (NSPoint newOrigin); [Export ("scrollClipView:toPoint:")] - void ScrollClipView (NSClipView aClipView, PointF aPoint); + void ScrollClipView (NSClipView aClipView, NSPoint aPoint); } [BaseType (typeof (NSViewController))] @@ -2255,7 +2280,7 @@ public interface NSCollectionViewItem { [BaseType (typeof (NSView))] public interface NSCollectionView : NSDraggingSource, NSDraggingDestination { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("isFirstResponder")] bool IsFirstResponder { get; } @@ -2264,10 +2289,10 @@ public interface NSCollectionView : NSDraggingSource, NSDraggingDestination { NSCollectionViewItem NewItemForRepresentedObject (NSObject obj); [Export ("itemAtIndex:")] - NSCollectionViewItem ItemAtIndex (int index); + NSCollectionViewItem ItemAtIndex (NSInteger index); [Export ("frameForItemAtIndex:")] - RectangleF FrameForItemAtIndex (int index); + NSRect FrameForItemAtIndex (NSInteger index); [Export ("setDraggingSourceOperationMask:forLocal:")] void SetDraggingSource (NSDragOperation dragOperationMask, bool localDestination); @@ -2298,23 +2323,23 @@ public interface NSCollectionView : NSDraggingSource, NSDraggingDestination { NSCollectionViewItem ItemPrototype { get; set; } [Export ("maxNumberOfRows")] - int MaxNumberOfRows { get; set; } + NSInteger MaxNumberOfRows { get; set; } [Export ("maxNumberOfColumns")] - int MaxNumberOfColumns { get; set; } + NSInteger MaxNumberOfColumns { get; set; } [Export ("minItemSize")] - SizeF MinItemSize { get; set; } + NSSize MinItemSize { get; set; } [Export ("maxItemSize")] - SizeF MaxItemSize { get; set; } + NSSize MaxItemSize { get; set; } [Export ("backgroundColors"), NullAllowed] NSColor [] BackgroundColors { get; set; } [Lion] [Export ("frameForItemAtIndex:withNumberOfItems:")] - RectangleF FrameForItemAtIndex (int index, int numberOfItems); + NSRect FrameForItemAtIndex (NSInteger index, NSInteger numberOfItems); } [BaseType (typeof (NSObject))] @@ -2334,10 +2359,10 @@ public partial interface NSCollectionViewDelegate { [Export ("collectionView:validateDrop:proposedIndex:dropOperation:")] //FIXME: NSCollectionViewDropOperation is also a ref (in/out) parameter - NSDragOperation ValidateDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, ref int dropIndex, NSCollectionViewDropOperation dropOperation); + NSDragOperation ValidateDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, ref NSInteger dropIndex, NSCollectionViewDropOperation dropOperation); [Export ("collectionView:acceptDrop:index:dropOperation:")] - bool AcceptDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, int index, NSCollectionViewDropOperation dropOperation); + bool AcceptDrop (NSCollectionView collectionView, NSDraggingInfo draggingInfo, NSInteger index, NSCollectionViewDropOperation dropOperation); } [BaseType (typeof (NSObject))] @@ -2345,31 +2370,31 @@ public partial interface NSCollectionViewDelegate { public partial interface NSColor { [Static] [Export ("colorWithCalibratedWhite:alpha:")] - NSColor FromCalibratedWhite (float white, float alpha); + NSColor FromCalibratedWhite (CGFloat white, CGFloat alpha); [Static] [Export ("colorWithCalibratedHue:saturation:brightness:alpha:")] - NSColor FromCalibratedHsba (float hue, float saturation, float brightness, float alpha); + NSColor FromCalibratedHsba (CGFloat hue, CGFloat saturation, CGFloat brightness, CGFloat alpha); [Static] [Export ("colorWithCalibratedRed:green:blue:alpha:")] - NSColor FromCalibratedRgba (float red, float green, float blue, float alpha); + NSColor FromCalibratedRgba (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); [Static] [Export ("colorWithDeviceWhite:alpha:")] - NSColor FromDeviceWhite (float white, float alpha); + NSColor FromDeviceWhite (CGFloat white, CGFloat alpha); [Static] [Export ("colorWithDeviceHue:saturation:brightness:alpha:")] - NSColor FromDeviceHsba (float hue, float saturation, float brightness, float alpha); + NSColor FromDeviceHsba (CGFloat hue, CGFloat saturation, CGFloat brightness, CGFloat alpha); [Static] [Export ("colorWithDeviceRed:green:blue:alpha:")] - NSColor FromDeviceRgba (float red, float green, float blue, float alpha); + NSColor FromDeviceRgba (CGFloat red, CGFloat green, CGFloat blue, CGFloat alpha); [Static] [Export ("colorWithDeviceCyan:magenta:yellow:black:alpha:")] - NSColor FromDeviceCymka (float cyan, float magenta, float yellow, float black, float alpha); + NSColor FromDeviceCymka (CGFloat cyan, CGFloat magenta, CGFloat yellow, CGFloat black, CGFloat alpha); [Static] [Export ("colorWithCatalogName:colorName:")] @@ -2377,7 +2402,7 @@ public partial interface NSColor { [Static] [Export ("colorWithColorSpace:components:count:"), Internal] - NSColor _FromColorSpace (NSColorSpace space, IntPtr components, int numberOfComponents); + NSColor _FromColorSpace (NSColorSpace space, IntPtr components, NSInteger numberOfComponents); [Static] [Export ("blackColor")] @@ -2568,10 +2593,10 @@ public partial interface NSColor { NSColor [] ControlAlternatingRowBackgroundColors (); [Export ("highlightWithLevel:")] - NSColor HighlightWithLevel (float highlightLevel); + NSColor HighlightWithLevel (CGFloat highlightLevel); [Export ("shadowWithLevel:")] - NSColor ShadowWithLevel (float shadowLevel); + NSColor ShadowWithLevel (CGFloat shadowLevel); [Static] [Export ("colorForControlTint:")] @@ -2603,10 +2628,10 @@ public partial interface NSColor { NSColor UsingColorSpace (NSColorSpace colorSpace); [Export ("blendedColorWithFraction:ofColor:")] - NSColor BlendedColor (float fraction, NSColor color); + NSColor BlendedColor (CGFloat fraction, NSColor color); [Export ("colorWithAlphaComponent:")] - NSColor ColorWithAlphaComponent (float alpha); + NSColor ColorWithAlphaComponent (CGFloat alpha); [Export ("catalogNameComponent")] string CatalogNameComponent { get; } @@ -2621,61 +2646,61 @@ public partial interface NSColor { string LocalizedColorNameComponent { get; } [Export ("redComponent")] - float RedComponent { get; } + CGFloat RedComponent { get; } [Export ("greenComponent")] - float GreenComponent { get; } + CGFloat GreenComponent { get; } [Export ("blueComponent")] - float BlueComponent { get; } + CGFloat BlueComponent { get; } [Export ("getRed:green:blue:alpha:")] - void GetRgba (out float red, out float green, out float blue, out float alpha); + void GetRgba (out CGFloat red, out CGFloat green, out CGFloat blue, out CGFloat alpha); [Export ("hueComponent")] - float HueComponent { get; } + CGFloat HueComponent { get; } [Export ("saturationComponent")] - float SaturationComponent { get; } + CGFloat SaturationComponent { get; } [Export ("brightnessComponent")] - float BrightnessComponent { get; } + CGFloat BrightnessComponent { get; } [Export ("getHue:saturation:brightness:alpha:")] - void GetHsba (out float hue, out float saturation, out float brightness, out float alpha); + void GetHsba (out CGFloat hue, out CGFloat saturation, out CGFloat brightness, out CGFloat alpha); [Export ("whiteComponent")] - float WhiteComponent { get; } + CGFloat WhiteComponent { get; } [Export ("getWhite:alpha:")] - void GetWhiteAlpha (out float white, out float alpha); + void GetWhiteAlpha (out CGFloat white, out CGFloat alpha); [Export ("cyanComponent")] - float CyanComponent { get; } + CGFloat CyanComponent { get; } [Export ("magentaComponent")] - float MagentaComponent { get; } + CGFloat MagentaComponent { get; } [Export ("yellowComponent")] - float YellowComponent { get; } + CGFloat YellowComponent { get; } [Export ("blackComponent")] - float BlackComponent { get; } + CGFloat BlackComponent { get; } [Export ("getCyan:magenta:yellow:black:alpha:")] - void GetCmyka (out float cyan, out float magenta, out float yellow, out float black, out float alpha); + void GetCmyka (out CGFloat cyan, out CGFloat magenta, out CGFloat yellow, out CGFloat black, out CGFloat alpha); [Export ("colorSpace")] NSColorSpace ColorSpace { get; } [Export ("numberOfComponents")] - int ComponentCount { get; } + NSInteger ComponentCount { get; } [Export ("getComponents:"), Internal] void _GetComponents (IntPtr components); [Export ("alphaComponent")] - float AlphaComponent { get; } + CGFloat AlphaComponent { get; } [Static] [Export ("colorFromPasteboard:")] @@ -2692,7 +2717,7 @@ public partial interface NSColor { NSImage PatternImage { get; } [Export ("drawSwatchInRect:")] - void DrawSwatchInRect (RectangleF rect); + void DrawSwatchInRect (NSRect rect); [Static] [Export ("ignoresAlpha")] @@ -2726,7 +2751,7 @@ public interface NSColorList { void SetColorForKey (NSColor color, string key); [Export ("insertColor:key:atIndex:")] - void InsertColor (NSColor color, string key, int indexPos); + void InsertColor (NSColor color, string key, NSInteger indexPos); [Export ("removeColorWithKey:")] void RemoveColor (string key); @@ -2769,7 +2794,7 @@ public interface NSColorPanel { void SetPickerMode (NSColorPanelMode mode); [Export ("alpha")] - float Alpha { get; } + CGFloat Alpha { get; } [Export ("setAction:")] void SetAction ([NullAllowed] Selector aSelector); @@ -2831,7 +2856,7 @@ public interface NSColorPicker { string ButtonToolTip { get; } [Export ("minContentSize")] - SizeF MinContentSize { get; } + NSSize MinContentSize { get; } } [BaseType (typeof (NSObject))] @@ -2938,7 +2963,7 @@ public interface NSColorSpace { [BaseType (typeof (NSControl))] public interface NSColorWell { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("deactivate")] void Deactivate (); @@ -2950,7 +2975,7 @@ public interface NSColorWell { bool IsActive { get; } [Export ("drawWellInside:")] - void DrawWellInside (RectangleF insideRect); + void DrawWellInside (NSRect insideRect); [Export ("takeColorFrom:")] void TakeColorFrom (NSObject sender); @@ -2968,19 +2993,19 @@ public interface NSColorWell { [BaseType (typeof (NSTextField))] public interface NSComboBox { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("hasVerticalScroller")] bool HasVerticalScroller { get; set; } [Export ("intercellSpacing")] - SizeF IntercellSpacing { get; set; } + NSSize IntercellSpacing { get; set; } [Export ("itemHeight")] - float ItemHeight { get; set; } + CGFloat ItemHeight { get; set; } [Export ("numberOfVisibleItems")] - int VisibleItems { get; set; } + NSInteger VisibleItems { get; set; } [Export ("buttonBordered")] bool ButtonBordered { [Bind ("isButtonBordered")] get; set; } @@ -2995,23 +3020,23 @@ public interface NSComboBox { bool UsesDataSource { get; set; } [Export ("scrollItemAtIndexToTop:")] - void ScrollItemAtIndexToTop (int scrollItemIndex); + void ScrollItemAtIndexToTop (NSInteger scrollItemIndex); [Export ("scrollItemAtIndexToVisible:")] - void ScrollItemAtIndexToVisible (int scrollItemIndex); + void ScrollItemAtIndexToVisible (NSInteger scrollItemIndex); [Export ("selectItemAtIndex:")] - void SelectItem (int itemIndex); + void SelectItem (NSInteger itemIndex); [Export ("deselectItemAtIndex:")] - void DeselectItem (int itemIndex); + void DeselectItem (NSInteger itemIndex); //- (NSInteger)indexOfSelectedItem; [Export ("indexOfSelectedItem")] - int SelectedIndex { get; } + NSInteger SelectedIndex { get; } [Export ("numberOfItems")] - int Count { get; } + NSInteger Count { get; } [Export ("completes")] bool Completes { get; set; } @@ -3026,13 +3051,13 @@ public interface NSComboBox { void Add (NSObject [] items); [Export ("insertItemWithObjectValue:atIndex:")] - void Insert (NSObject object1, int index); + void Insert (NSObject object1, NSInteger index); [Export ("removeItemWithObjectValue:")] void Remove (NSObject object1); [Export ("removeItemAtIndex:")] - void RemoveAt (int index); + void RemoveAt (NSInteger index); [Export ("removeAllItems")] void RemoveAll (); @@ -3041,13 +3066,13 @@ public interface NSComboBox { void Select (NSObject object1); [Export ("itemObjectValueAtIndex:")] - NSComboBox GetItem (int index); + NSComboBox GetItem (NSInteger index); [Export ("objectValueOfSelectedItem")] NSObject SelectedValue { get; } [Export ("indexOfItemWithObjectValue:")] - int IndexOf (NSObject object1); + NSInteger IndexOf (NSObject object1); [Export ("objectValues")] NSObject [] Values { get; } @@ -3057,22 +3082,22 @@ public interface NSComboBox { [Model] public interface NSComboBoxDataSource { [Export ("comboBox:objectValueForItemAtIndex:")] - NSObject ObjectValueForItem (NSComboBox comboBox, int index); + NSObject ObjectValueForItem (NSComboBox comboBox, NSInteger index); [Export ("numberOfItemsInComboBox:")] - int ItemCount (NSComboBox comboBox); + NSInteger ItemCount (NSComboBox comboBox); [Export ("comboBox:completedString:")] string CompletedString (NSComboBox comboBox, string uncompletedString); [Export ("comboBox:indexOfItemWithStringValue:")] - int IndexOfItem (NSComboBox comboBox, string value); + NSInteger IndexOfItem (NSComboBox comboBox, string value); } - + [BaseType (typeof (NSView))] public partial interface NSControl { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("sizeToFit")] void SizeToFit (); @@ -3084,10 +3109,10 @@ public partial interface NSControl { NSCell SelectedCell { get; } [Export ("selectedTag")] - int SelectedTag { get; } + NSInteger SelectedTag { get; } [Export ("sendActionOn:")] - int SendActionOn (NSEventType mask); + NSInteger SendActionOn (NSEventType mask); [Export ("setNeedsDisplay")] void SetNeedsDisplay (); @@ -3155,7 +3180,7 @@ public partial interface NSControl { Selector Action { get; set; } [Export ("tag")] - int Tag { get; set; } + NSInteger Tag { get; set; } [Export ("ignoresMultiClick")] bool IgnoresMultiClick { get; set; } @@ -3197,7 +3222,7 @@ public partial interface NSControl { NSWritingDirection BaseWritingDirection { get; set; } [Export ("integerValue")] - int IntegerValue { get; set; } + NSInteger IntegerValue { get; set; } [Export ("performClick:")] void PerformClick (NSObject sender); @@ -3312,10 +3337,10 @@ public interface NSCursor { NSCursor IBeamCursorForVerticalLayout { get; } [Export ("initWithImage:hotSpot:")] - IntPtr Constructor (NSImage newImage, PointF aPoint); + IntPtr Constructor (NSImage newImage, NSPoint aPoint); [Export ("initWithImage:foregroundColorHint:backgroundColorHint:hotSpot:")] - IntPtr Constructor (NSImage newImage, NSColor fg, NSColor bg, PointF hotSpot); + IntPtr Constructor (NSImage newImage, NSColor fg, NSColor bg, NSPoint hotSpot); [Static] [Export ("hide")] @@ -3337,7 +3362,7 @@ public interface NSCursor { NSImage Image { get; } [Export ("hotSpot")] - PointF HotSpot { get; } + NSPoint HotSpot { get; } [Export ("push")] void Push (); @@ -3383,7 +3408,7 @@ public partial interface NSCustomImageRep { [BaseType (typeof (NSControl), Delegates=new string [] {"WeakDelegate"}, Events=new Type [] {typeof (NSDatePickerCellDelegate)})] public interface NSDatePicker { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); //Detected properties [Export ("datePickerStyle")] @@ -3507,7 +3532,7 @@ public interface NSDatePickerCellDelegate { [BaseType (typeof (NSObject))] public interface NSDockTile { [Export ("size")] - SizeF Size { get; } + NSSize Size { get; } [Export ("display")] void Display (); @@ -3888,7 +3913,7 @@ public partial interface NSDocumentController : NSWindowRestoration { NSUrl [] UrlsFromRunningOpenPanel (); [Export ("runModalOpenPanel:forTypes:")] - int RunModalOpenPanel (NSOpenPanel openPanel, string [] types); + NSInteger RunModalOpenPanel (NSOpenPanel openPanel, string [] types); [Export ("openDocumentWithContentsOfURL:display:error:")] NSObject OpenDocument (NSUrl url, bool displayDocument, out NSError outError); @@ -3928,7 +3953,7 @@ public partial interface NSDocumentController : NSWindowRestoration { NSError WillPresentError (NSError error); [Export ("maximumRecentDocumentCount")] - int MaximumRecentDocumentCount { get; } + NSInteger MaximumRecentDocumentCount { get; } [Export ("clearRecentDocuments:")] void ClearRecentDocuments ([NullAllowed] NSObject sender); @@ -3975,7 +4000,7 @@ public interface NSDraggingImageComponent { NSObject Contents { get; set; } [Export ("frame")] - RectangleF Frame { get; set; } + NSRect Frame { get; set; } [Static] [Export ("draggingImageComponentWithKey:")] @@ -3999,7 +4024,7 @@ public interface NSDraggingItem { NSObject Item { get; } [Export ("draggingFrame")] - RectangleF DraggingFrame { get; set; } + NSRect DraggingFrame { get; set; } [Export ("imageComponents")] NSDraggingImageComponent [] ImageComponents { get; } @@ -4011,7 +4036,7 @@ public interface NSDraggingItem { void SetImagesContentProvider ([NullAllowed] NSDraggingItemImagesContentProvider provider); [Export ("setDraggingFrame:contents:")] - void SetDraggingFrame (RectangleF frame, NSObject contents); + void SetDraggingFrame (NSRect frame, NSObject contents); } @@ -4027,10 +4052,10 @@ public interface NSDraggingInfo { NSDragOperation DraggingSourceOperationMask { get; } [Export ("draggingLocation")] - PointF DraggingLocation { get; } + NSPoint DraggingLocation { get; } [Export ("draggedImageLocation")] - PointF DraggedImageLocation { get; } + NSPoint DraggedImageLocation { get; } [Export ("draggedImage")] NSImage DraggedImage { get; } @@ -4042,10 +4067,10 @@ public interface NSDraggingInfo { NSObject DraggingSource { get; } [Export ("draggingSequenceNumber")] - int DraggingSequenceNumber { get; } + NSInteger DraggingSequenceNumber { get; } [Export ("slideDraggedImageTo:")] - void SlideDraggedImageTo (PointF screenPoint); + void SlideDraggedImageTo (NSPoint screenPoint); [Export ("namesOfPromisedFilesDroppedAtDestination:")] string [] PromisedFilesDroppedAtDestination (NSUrl dropDestination); @@ -4056,7 +4081,7 @@ public interface NSDraggingInfo { [Lion] [Export ("numberOfValidItemsForDrop")] - int NumberOfValidItemsForDrop { get; set; } + NSInteger NumberOfValidItemsForDrop { get; set; } [Lion] [Export ("draggingFormation")] @@ -4107,16 +4132,16 @@ public interface NSDraggingSession { bool AnimatesToStartingPositionsOnCancelOrFail { get; set; } [Export ("draggingLeaderIndex")] - int DraggingLeaderIndex { get; set; } + NSInteger DraggingLeaderIndex { get; set; } [Export ("draggingPasteboard")] NSPasteboard DraggingPasteboard { get; } [Export ("draggingSequenceNumber")] - int DraggingSequenceNumber { get; } + NSInteger DraggingSequenceNumber { get; } [Export ("draggingLocation")] - PointF DraggingLocation { get; } + NSPoint DraggingLocation { get; } [Export ("enumerateDraggingItemsWithOptions:forView:classes:searchOptions:usingBlock:")] void EnumerateDraggingItems (NSDraggingItemEnumerationOptions enumOpts, NSView view, NSPasteboardReading [] classArray, NSDictionary searchOptions, NSDraggingEnumerator enumerator); @@ -4133,26 +4158,26 @@ public interface NSDraggingSource { string [] NamesOfPromisedFilesDroppedAtDestination (NSUrl dropDestination); [Export ("draggedImage:beganAt:")] - void DraggedImageBeganAt (NSImage image, PointF screenPoint); + void DraggedImageBeganAt (NSImage image, NSPoint screenPoint); [Export ("draggedImage:endedAt:operation:")] - void DraggedImageEndedAtOperation (NSImage image, PointF screenPoint, NSDragOperation operation); + void DraggedImageEndedAtOperation (NSImage image, NSPoint screenPoint, NSDragOperation operation); [Export ("draggedImage:movedTo:")] - void DraggedImageMovedTo (NSImage image, PointF screenPoint); + void DraggedImageMovedTo (NSImage image, NSPoint screenPoint); [Export ("ignoreModifierKeysWhileDragging"), DefaultValue (false)] bool IgnoreModifierKeysWhileDragging { get; } [Obsolete ("On 10.1 and newer, use DraggedImageEndedAtOperation() instead")] [Export ("draggedImage:endedAt:deposited:")] - void DraggedImageEndedAtDeposited (NSImage image, PointF screenPoint, bool deposited); + void DraggedImageEndedAtDeposited (NSImage image, NSPoint screenPoint, bool deposited); } [BaseType (typeof (NSResponder), Delegates=new string [] { "WeakDelegate" }, Events=new Type [] { typeof (NSDrawerDelegate)})] public interface NSDrawer { [Export ("initWithContentSize:preferredEdge:")] - IntPtr Constructor (SizeF contentSize, NSRectEdge edge); + IntPtr Constructor (NSSize contentSize, NSRectEdge edge); [Export ("parentWindow")] NSWindow ParentWindow { get; set; } @@ -4194,19 +4219,19 @@ public interface NSDrawer { NSRectEdge Edge { get; } [Export ("contentSize")] - SizeF ContentSize { get; set; } + NSSize ContentSize { get; set; } [Export ("minContentSize")] - SizeF MinContentSize { get; set; } + NSSize MinContentSize { get; set; } [Export ("maxContentSize")] - SizeF MaxContentSize { get; set; } + NSSize MaxContentSize { get; set; } [Export ("leadingOffset")] - float LeadingOffset { get; set; } + CGFloat LeadingOffset { get; set; } [Export ("trailingOffset")] - float TrailingOffset { get; set; } + CGFloat TrailingOffset { get; set; } } [BaseType (typeof (NSObject))] @@ -4231,7 +4256,7 @@ public interface NSDrawerDelegate { void DrawerWillOpen (NSNotification notification); [Export ("drawerWillResizeContents:toSize:"), DelegateName ("DrawerWillResizeContentsDelegate"), DefaultValue (null)] - SizeF DrawerWillResizeContents (NSDrawer sender, SizeF toSize); + NSSize DrawerWillResizeContents (NSDrawer sender, NSSize toSize); } @@ -4240,7 +4265,7 @@ public interface NSDrawerDelegate { public interface NSFont { [Static] [Export ("fontWithName:size:")] - NSFont FromFontName (string fontName, float fontSize); + NSFont FromFontName (string fontName, CGFloat fontSize); //[Static] //[Export ("fontWithName:matrix:")] @@ -4248,7 +4273,7 @@ public interface NSFont { [Static] [Export ("fontWithDescriptor:size:")] - NSFont FromDescription (NSFontDescriptor fontDescriptor, float fontSize); + NSFont FromDescription (NSFontDescriptor fontDescriptor, CGFloat fontSize); [Static] [Export ("fontWithDescriptor:textTransform:")] @@ -4256,11 +4281,11 @@ public interface NSFont { [Static] [Export ("userFontOfSize:")] - NSFont UserFontOfSize (float fontSize); + NSFont UserFontOfSize (CGFloat fontSize); [Static] [Export ("userFixedPitchFontOfSize:")] - NSFont UserFixedPitchFontOfSize (float fontSize); + NSFont UserFixedPitchFontOfSize (CGFloat fontSize); [Static] [Export ("setUserFont:")] @@ -4272,65 +4297,65 @@ public interface NSFont { [Static] [Export ("systemFontOfSize:")] - NSFont SystemFontOfSize (float fontSize); + NSFont SystemFontOfSize (CGFloat fontSize); [Static] [Export ("boldSystemFontOfSize:")] - NSFont BoldSystemFontOfSize (float fontSize); + NSFont BoldSystemFontOfSize (CGFloat fontSize); [Static] [Export ("labelFontOfSize:")] - NSFont LabelFontOfSize (float fontSize); + NSFont LabelFontOfSize (CGFloat fontSize); [Static] [Export ("titleBarFontOfSize:")] - NSFont TitleBarFontOfSize (float fontSize); + NSFont TitleBarFontOfSize (CGFloat fontSize); [Static] [Export ("menuFontOfSize:")] - NSFont MenuFontOfSize (float fontSize); + NSFont MenuFontOfSize (CGFloat fontSize); [Static] [Export("menuBarFontOfSize:")] - NSFont MenuBarFontOfSize (float fontSize); + NSFont MenuBarFontOfSize (CGFloat fontSize); [Static] [Export("messageFontOfSize:")] - NSFont MessageFontOfSize (float fontSize); + NSFont MessageFontOfSize (CGFloat fontSize); [Static] [Export ("paletteFontOfSize:")] - NSFont PaletteFontOfSize (float fontSize); + NSFont PaletteFontOfSize (CGFloat fontSize); [Static] [Export ("toolTipsFontOfSize:")] - NSFont ToolTipsFontOfSize (float fontSize); + NSFont ToolTipsFontOfSize (CGFloat fontSize); [Static] [Export ("controlContentFontOfSize:")] - NSFont ControlContentFontOfSize (float fontSize); + NSFont ControlContentFontOfSize (CGFloat fontSize); [Static] [Export ("systemFontSize")] - float SystemFontSize { get; } + CGFloat SystemFontSize { get; } [Static] [Export ("smallSystemFontSize")] - float SmallSystemFontSize { get; } + CGFloat SmallSystemFontSize { get; } [Static] [Export ("labelFontSize")] - float LabelFontSize { get; } + CGFloat LabelFontSize { get; } [Static] - [Export ("systemFontSizeForControlSize:")] - float SystemFontSizeForControlSize (NSControlSize controlSize); + [Export ("systemFontNSSizeorControlSize:")] + CGFloat SystemFontNSSizeorControlSize (NSControlSize controlSize); [Export ("fontName")] string FontName { get; } [Export ("pointSize")] - float PointSize { get; } + CGFloat PointSize { get; } //[Export ("matrix")] // FIXME @@ -4349,7 +4374,7 @@ public interface NSFont { NSAffineTransform TextTransform { get; } [Export ("numberOfGlyphs")] - int GlyphCount { get; } + NSUInteger GlyphCount { get; } [Export ("mostCompatibleStringEncoding")] NSStringEncoding MostCompatibleStringEncoding { get; } @@ -4361,43 +4386,43 @@ public interface NSFont { NSCharacterSet CoveredCharacterSet { get; } [Export ("boundingRectForFont")] - RectangleF BoundingRectForFont { get; } + NSRect BoundingRectForFont { get; } [Export ("maximumAdvancement")] - SizeF MaximumAdvancement { get; } + NSSize MaximumAdvancement { get; } [Export ("ascender")] - float Ascender { get; } + CGFloat Ascender { get; } [Export ("descender")] - float Descender { get; } + CGFloat Descender { get; } [Export ("leading")] - float Leading { get; } + CGFloat Leading { get; } [Export ("underlinePosition")] - float UnderlinePosition { get; } + CGFloat UnderlinePosition { get; } [Export ("underlineThickness")] - float UnderlineThickness { get; } + CGFloat UnderlineThickness { get; } [Export ("italicAngle")] - float ItalicAngle { get; } + CGFloat ItalicAngle { get; } [Export ("capHeight")] - float CapHeight { get; } + CGFloat CapHeight { get; } [Export ("xHeight")] - float XHeight { get; } + CGFloat XHeight { get; } [Export ("isFixedPitch")] bool IsFixedPitch { get; } [Export ("boundingRectForGlyph:")] - RectangleF BoundingRectForGlyph (uint aGlyph); + NSRect BoundingRectForGlyph (uint aGlyph); [Export ("advancementForGlyph:")] - SizeF AdvancementForGlyph (uint ag); + NSSize AdvancementForGlyph (uint ag); // FIXME binding //[Export ("getBoundingRects:forGlyphs:count:")] @@ -4566,7 +4591,7 @@ public interface NSFontDescriptor { string PostscriptName { get; } [Export ("pointSize")] - float PointSize { get; } + CGFloat PointSize { get; } [Export ("matrix")] NSAffineTransform Matrix { get; } @@ -4586,7 +4611,7 @@ public interface NSFontDescriptor { [Static] [Export ("fontDescriptorWithName:size:")] - NSFontDescriptor FromNameSize (string fontName, float size); + NSFontDescriptor FromNameSize (string fontName, CGFloat size); [Static] [Export ("fontDescriptorWithName:matrix:")] @@ -4608,7 +4633,7 @@ public interface NSFontDescriptor { NSFontDescriptor FontDescriptorWithSymbolicTraits (NSFontSymbolicTraits symbolicTraits); [Export ("fontDescriptorWithSize:")] - NSFontDescriptor FontDescriptorWithSize (float newPointSize); + NSFontDescriptor FontDescriptorWithSize (CGFloat newPointSize); [Export ("fontDescriptorWithMatrix:")] NSFontDescriptor FontDescriptorWithMatrix (NSAffineTransform matrix); @@ -4650,13 +4675,13 @@ public interface NSFontManager { NSFontPanel FontPanel (bool create); [Export ("fontWithFamily:traits:weight:size:")] - NSFont FontWithFamily (string family, NSFontTraitMask traits, int weight, float size); + NSFont FontWithFamily (string family, NSFontTraitMask traits, NSInteger weight, CGFloat size); [Export ("traitsOfFont:")] NSFontTraitMask TraitsOfFont (NSFont fontObj); [Export ("weightOfFont:")] - int WeightOfFont (NSFont fontObj); + NSInteger WeightOfFont (NSFont fontObj); [Export ("availableFonts")] string [] AvailableFonts { get; } @@ -4671,7 +4696,7 @@ public interface NSFontManager { NSFont ConvertFont (NSFont fontObj); [Export ("convertFont:toSize:")] - NSFont ConvertFont (NSFont fontObj, float size); + NSFont ConvertFont (NSFont fontObj, CGFloat size); [Export ("convertFont:toFace:")] NSFont ConvertFont (NSFont fontObj, string typeface); @@ -4731,7 +4756,7 @@ public interface NSFontManager { void RemoveFontDescriptor (NSFontDescriptor descriptor, string collection); [Export ("currentFontAction")] - int CurrentFontAction { get; } + NSInteger CurrentFontAction { get; } [Export ("convertFontTraits:")] NSFontTraitMask ConvertFontTraits (NSFontTraitMask traits); @@ -4797,22 +4822,22 @@ public interface NSFontPanel { [BaseType (typeof (NSMatrix))] public partial interface NSForm { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("initWithFrame:mode:prototype:numberOfRows:numberOfColumns:")] - IntPtr Constructor (RectangleF frameRect, NSMatrixMode aMode, NSCell aCell, int rowsHigh, int colsWide); + IntPtr Constructor (NSRect frameRect, NSMatrixMode aMode, NSCell aCell, NSInteger rowsHigh, NSInteger colsWide); [Export ("initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:")] - IntPtr Constructor (RectangleF frameRect, NSMatrixMode aMode, Class factoryId, int rowsHigh, int colsWide); + IntPtr Constructor (NSRect frameRect, NSMatrixMode aMode, Class factoryId, NSInteger rowsHigh, NSInteger colsWide); [Export ("indexOfSelectedItem")] - int SelectedItemIndex { get; } + NSInteger SelectedItemIndex { get; } [Export ("setEntryWidth:")] - void SetEntryWidth (float width); + void SetEntryWidth (CGFloat width); [Export ("setInterlineSpacing:")] - void SetInterlineSpacing (float spacing); + void SetInterlineSpacing (CGFloat spacing); [Export ("setBordered:")] void SetBordered (bool bordered); @@ -4833,28 +4858,28 @@ public partial interface NSForm { void SetTextFont (NSFont fontObj); [Export ("cellAtIndex:")] - NSObject CellAtIndex (int index); + NSObject CellAtIndex (NSInteger index); [Export ("drawCellAtIndex:")] - void DrawCellAtIndex (int index); + void DrawCellAtIndex (NSInteger index); [Export ("addEntry:")] NSFormCell AddEntry (string title); [Export ("insertEntry:atIndex:")] - NSFormCell InsertEntryatIndex (string title, int index); + NSFormCell InsertEntryatIndex (string title, NSInteger index); [Export ("removeEntryAtIndex:")] - void RemoveEntryAtIndex (int index); + void RemoveEntryAtIndex (NSInteger index); [Export ("indexOfCellWithTag:")] - int IndexOfCellWithTag (int aTag); + NSInteger IndexOfCellWithTag (NSInteger aTag); [Export ("selectTextAtIndex:")] - void SelectTextAtIndex (int index); + void SelectTextAtIndex (NSInteger index); [Export ("setFrameSize:")] - void SetFrameSize (SizeF newSize); + void SetFrameSize (NSSize newSize); [Export ("setTitleBaseWritingDirection:")] void SetTitleBaseWritingDirection (NSWritingDirection writingDirection); @@ -4879,7 +4904,7 @@ public partial interface NSFormCell { //Detected properties [Export ("titleWidth")] - float TitleWidth { get; set; } + CGFloat TitleWidth { get; set; } [Export ("title")] string Title { get; set; } @@ -4909,7 +4934,7 @@ public partial interface NSFormCell { [BaseType (typeof (NSObject))] public interface NSGlyphGenerator { [Export ("generateGlyphsForGlyphStorage:desiredNumberOfCharacters:glyphIndex:characterIndex:")] - void GenerateGlyphs (NSObject nsGlyphStorageOrNSLayoutManager, uint nchars, ref uint glyphIndex, ref uint charIndex); + void GenerateGlyphs (NSObject nsGlyphStorageOrNSLayoutManager, NSUInteger nchars, ref NSUInteger glyphIndex, ref NSUInteger charIndex); [Static, Export ("sharedGlyphGenerator")] NSGlyphGenerator SharedGlyphGenerator { get; } @@ -4928,36 +4953,36 @@ public interface NSGradient { //[Export ("initWithColors:atLocations:colorSpace:")] [Export ("drawFromPoint:toPoint:options:")] - void DrawFromPoint (PointF startingPoint, PointF endingPoint, NSGradientDrawingOptions options); + void DrawFromPoint (NSPoint startingPoint, NSPoint endingPoint, NSGradientDrawingOptions options); [Export ("drawInRect:angle:")] - void DrawInRect (RectangleF rect, float angle); + void DrawInRect (NSRect rect, CGFloat angle); [Export ("drawInBezierPath:angle:")] - void DrawInBezierPath (NSBezierPath path, float angle); + void DrawInBezierPath (NSBezierPath path, CGFloat angle); [Export ("drawFromCenter:radius:toCenter:radius:options:")] - void DrawFromCenterRadius (PointF startCenter, float startRadius, PointF endCenter, float endRadius, NSGradientDrawingOptions options); + void DrawFromCenterRadius (NSPoint startCenter, CGFloat startRadius, NSPoint endCenter, CGFloat endRadius, NSGradientDrawingOptions options); [Export ("drawInRect:relativeCenterPosition:")] - void DrawInRect (RectangleF rect, PointF relativeCenterPosition); + void DrawInRect (NSRect rect, NSPoint relativeCenterPosition); [Export ("drawInBezierPath:relativeCenterPosition:")] - void DrawInBezierPath (NSBezierPath path, PointF relativeCenterPosition); + void DrawInBezierPath (NSBezierPath path, NSPoint relativeCenterPosition); [Export ("colorSpace")] NSColorSpace ColorSpace { get; } [Export ("numberOfColorStops")] - int ColorStopsCount { get; } + NSInteger ColorStopsCount { get; } [Export ("getColor:location:atIndex:")] - void GetColor (out NSColor color, out float location, int index); + void GetColor (out NSColor color, out CGFloat location, NSInteger index); [Export ("interpolatedColorAtLocation:")] NSColor GetInterpolatedColor(float location); } - + /* [BaseType (typeof (NSObject))] public interface NSGraphicsContext { [Static, Export ("graphicsContextWithAttributes:")] @@ -4985,7 +5010,7 @@ public interface NSGraphicsContext { void GlobalRestoreGraphicsState (); [Static, Export ("setGraphicsState:")] - void SetGraphicsState (int gState); + void SetGraphicsState (NSInteger gState); [Export ("attributes")] NSDictionary Attributes { get; } @@ -5016,7 +5041,7 @@ public interface NSGraphicsContext { NSImageInterpolation ImageInterpolation { get; set; } [Export ("patternPhase")] - PointF PatternPhase { get; set; } + NSPoint PatternPhase { get; set; } [Export ("compositingOperation")] NSComposite CompositingOperation { get; set; } @@ -5027,6 +5052,59 @@ public interface NSGraphicsContext { [Export ("CIContext")] MonoMac.CoreImage.CIContext CIContext { get; } } + */ + [BaseType (typeof (NSObject))] + public partial interface NSGraphicsContext { + + [Static, Export ("graphicsContextWithAttributes:")] + NSGraphicsContext GraphicsContextWithAttributes (NSDictionary attributes); + + [Static, Export ("graphicsContextWithWindow:")] + NSGraphicsContext GraphicsContextWithWindow (NSWindow window); + + [Static, Export ("graphicsContextWithBitmapImageRep:")] + NSGraphicsContext GraphicsContextWithBitmapImageRep (NSBitmapImageRep bitmapRep); + + [Static, Export ("graphicsContextWithGraphicsPort:flipped:")] + NSGraphicsContext FromGraphicsPort (IntPtr graphicsPort, bool initialFlippedState); + + [Static, Export ("currentContext"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 57), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 58)] + NSGraphicsContext CurrentContext { get; set; } + + [Export ("currentContextDrawingToScreen"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 61)] + bool CurrentContextDrawingToScreen { get; } + + [Static, Export ("saveGraphicsState")] + void StaticSaveGraphicsState (); + + [Static, Export ("restoreGraphicsState")] + void StaticRestoreGraphicsState (); + + [Export ("graphicsState"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 69)] + NSInteger GraphicsState { set; } + + [Export ("attributes"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 72)] + NSDictionary Attributes { get; } + + [Export ("isDrawingToScreen"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 75)] + bool IsDrawingToScreen { get; } + + [Export ("saveGraphicsState")] + void SaveGraphicsState (); + + [Export ("restoreGraphicsState")] + void RestoreGraphicsState (); + + [Export ("flushGraphics")] + void FlushGraphics (); + + [Export ("graphicsPort"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 84)] + IntPtr GraphicsPortHandle { get; } + + [Export ("isFlipped"), Verify ("/System/Library/Frameworks/AppKit.framework/Headers/NSGraphicsContext.h", Line = 88)] + bool IsFlipped { get; } + } + [BaseType (typeof (NSImageRep))] [DisableDefaultCtor] // An uncaught exception was raised: -[NSEPSImageRep init]: unrecognized selector sent to instance 0x1db2d90 @@ -5045,7 +5123,7 @@ public interface NSEPSImageRep { NSData EPSRepresentation { get; } [Export ("boundingBox")] - RectangleF BoundingBox { get; } + NSRect BoundingBox { get; } } public delegate void GlobalEventHandler (NSEvent theEvent); @@ -5067,7 +5145,7 @@ public interface NSEvent { NSWindow Window { get; } [Export ("windowNumber")] - int WindowNumber { get; } + NSInteger WindowNumber { get; } [Export ("context")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5075,35 +5153,35 @@ public interface NSEvent { [Export ("clickCount")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int ClickCount { get; } + NSInteger ClickCount { get; } [Export ("buttonNumber")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int ButtonNumber { get; } + NSInteger ButtonNumber { get; } [Export ("eventNumber")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int EventNumber { get; } + NSInteger EventNumber { get; } [Export ("pressure")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float Pressure { get; } + CGFloat Pressure { get; } [Export ("locationInWindow")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - PointF LocationInWindow { get; } + NSPoint LocationInWindow { get; } [Export ("deltaX")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float DeltaX { get; } + CGFloat DeltaX { get; } [Export ("deltaY")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float DeltaY { get; } + CGFloat DeltaY { get; } [Export ("deltaZ")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float DeltaZ { get; } + CGFloat DeltaZ { get; } [Export ("characters")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5123,7 +5201,7 @@ public interface NSEvent { [Export ("trackingNumber")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int TrackingNumber { get; } + NSInteger TrackingNumber { get; } [Export ("userData")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5139,11 +5217,11 @@ public interface NSEvent { [Export ("data1")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int Data1 { get; } + NSInteger Data1 { get; } [Export ("data2")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int Data2 { get; } + NSInteger Data2 { get; } //[Export ("eventRef")] //const void * EventRef (); @@ -5161,40 +5239,40 @@ public interface NSEvent { [Export ("magnification")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float Magnification { get; } + CGFloat Magnification { get; } [Export ("deviceID")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint DeviceID { get; } + NSUInteger DeviceID { get; } [Export ("rotation")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float Rotation { get; } + CGFloat Rotation { get; } [Export ("absoluteX")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int AbsoluteX { get; } + NSInteger AbsoluteX { get; } [Export ("absoluteY")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int AbsoluteY { get; } + NSInteger AbsoluteY { get; } [Export ("absoluteZ")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - int AbsoluteZ { get; } + NSInteger AbsoluteZ { get; } // TODO: What is the type? [Export ("buttonMask")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint ButtonMask { get; } + NSUInteger ButtonMask { get; } [Export ("tilt")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - PointF Tilt { get; } + NSPoint Tilt { get; } [Export ("tangentialPressure")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float TangentialPressure { get; } + CGFloat TangentialPressure { get; } [Export ("vendorDefined")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5202,26 +5280,26 @@ public interface NSEvent { [Export ("vendorID")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint VendorID { get; } + NSUInteger VendorID { get; } [Export ("tabletID")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint TabletID { get; } + NSUInteger TabletID { get; } [Export ("pointingDeviceID")] - uint PointingDeviceID (); + NSUInteger PointingDeviceID (); [Export ("systemTabletID")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint SystemTabletID { get; } + NSUInteger SystemTabletID { get; } [Export ("vendorPointingDeviceType")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint VendorPointingDeviceType { get; } + NSUInteger VendorPointingDeviceType { get; } [Export ("pointingDeviceSerialNumber")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint PointingDeviceSerialNumber { get; } + NSUInteger PointingDeviceSerialNumber { get; } [Export ("uniqueID")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5229,7 +5307,7 @@ public interface NSEvent { [Export ("capabilityMask")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - uint CapabilityMask { get; } + NSUInteger CapabilityMask { get; } [Export ("pointingDeviceType")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] @@ -5252,23 +5330,23 @@ public interface NSEvent { [Static] [Export ("mouseEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:clickCount:pressure:")] - NSEvent MouseEvent (NSEventType type, PointF location, NSEventModifierMask flags, double time, int wNum, [NullAllowed] NSGraphicsContext context, int eNum, int cNum, float pressure); + NSEvent MouseEvent (NSEventType type, NSPoint location, NSEventModifierMask flags, double time, NSInteger wNum, [NullAllowed] NSGraphicsContext context, NSInteger eNum, NSInteger cNum, CGFloat pressure); [Static] [Export ("keyEventWithType:location:modifierFlags:timestamp:windowNumber:context:characters:charactersIgnoringModifiers:isARepeat:keyCode:")] - NSEvent KeyEvent (NSEventType type, PointF location, NSEventModifierMask flags, double time, int wNum, [NullAllowed] NSGraphicsContext context, string keys, string ukeys, bool isARepeat, ushort code); + NSEvent KeyEvent (NSEventType type, NSPoint location, NSEventModifierMask flags, double time, NSInteger wNum, [NullAllowed] NSGraphicsContext context, string keys, string ukeys, bool isARepeat, ushort code); [Static] [Export ("enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:")] - NSEvent EnterExitEvent (NSEventType type, PointF location, NSEventModifierMask flags, double time, int wNum, [NullAllowed] NSGraphicsContext context, int eNum, int tNum, IntPtr data); + NSEvent EnterExitEvent (NSEventType type, NSPoint location, NSEventModifierMask flags, double time, NSInteger wNum, [NullAllowed] NSGraphicsContext context, NSInteger eNum, NSInteger tNum, IntPtr data); [Static] [Export ("otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:")] - NSEvent OtherEvent (NSEventType type, PointF location, NSEventModifierMask flags, double time, int wNum, [NullAllowed] NSGraphicsContext context, short subtype, int d1, int d2); + NSEvent OtherEvent (NSEventType type, NSPoint location, NSEventModifierMask flags, double time, NSInteger wNum, [NullAllowed] NSGraphicsContext context, short subtype, NSInteger d1, NSInteger d2); [Static] [Export ("mouseLocation")] - PointF CurrentMouseLocation { get; } + NSPoint CurrentMouseLocation { get; } [Static] [Export ("modifierFlags")] @@ -5276,7 +5354,7 @@ public interface NSEvent { [Static] [Export ("pressedMouseButtons")] - uint CurrentPressedMouseButtons { get; } + NSUInteger CurrentPressedMouseButtons { get; } [Static] [Export ("doubleClickInterval")] @@ -5315,12 +5393,12 @@ public interface NSEvent { [Lion] [Export ("scrollingDeltaX")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float ScrollingDeltaX { get; } + CGFloat ScrollingDeltaX { get; } [Lion] [Export ("scrollingDeltaY")] [DebuggerBrowsable (DebuggerBrowsableState.Never)] - float ScrollingDeltaY { get; } + CGFloat ScrollingDeltaY { get; } [Lion] [Export ("momentumPhase")] @@ -5344,7 +5422,7 @@ public interface NSEvent { [Lion] [Export ("trackSwipeEventWithOptions:dampenAmountThresholdMin:max:usingHandler:")] - void TrackSwipeEvent (NSEventSwipeTrackingOptions options, float minDampenThreshold, float maxDampenThreshold, NSEventTrackHandler trackingHandler); + void TrackSwipeEvent (NSEventSwipeTrackingOptions options, CGFloat minDampenThreshold, CGFloat maxDampenThreshold, NSEventTrackHandler trackingHandler); } [BaseType (typeof (NSObject))] @@ -5361,22 +5439,22 @@ public interface NSMenu { void PopUpContextMenu (NSMenu menu, NSEvent theEvent, NSView view, [NullAllowed] NSFont font); [Export ("popUpMenuPositioningItem:atLocation:inView:")] - bool PopUpMenu ([NullAllowed] NSMenuItem item, PointF location, [NullAllowed] NSView view); + bool PopUpMenu ([NullAllowed] NSMenuItem item, NSPoint location, [NullAllowed] NSView view); [Export ("insertItem:atIndex:")] - void InsertItem (NSMenuItem newItem, int index); + void InsertItem (NSMenuItem newItem, NSInteger index); [Export ("addItem:")] void AddItem (NSMenuItem newItem); [Export ("insertItemWithTitle:action:keyEquivalent:atIndex:")] - NSMenuItem InsertItem (string title, [NullAllowed] Selector action, string charCode, int index); + NSMenuItem InsertItem (string title, [NullAllowed] Selector action, string charCode, NSInteger index); [Export ("addItemWithTitle:action:keyEquivalent:")] NSMenuItem AddItem (string title, [NullAllowed] Selector action, string charCode); [Export ("removeItemAtIndex:")] - void RemoveItemAt (int index); + void RemoveItemAt (NSInteger index); [Export ("removeItem:")] void RemoveItem (NSMenuItem item); @@ -5391,34 +5469,34 @@ public interface NSMenu { NSMenuItem [] ItemArray (); [Export ("numberOfItems")] - int Count { get; } + NSInteger Count { get; } [Export ("itemAtIndex:")] - NSMenuItem ItemAt (int index); + NSMenuItem ItemAt (NSInteger index); [Export ("indexOfItem:")] - int IndexOf (NSMenuItem index); + NSInteger IndexOf (NSMenuItem index); [Export ("indexOfItemWithTitle:")] - int IndexOf (string aTitle); + NSInteger IndexOf (string aTitle); [Export ("indexOfItemWithTag:")] - int IndexOf (int itemTag); + NSInteger IndexOf (NSInteger itemTag); [Export ("indexOfItemWithRepresentedObject:")] - int IndexOfItem (NSObject obj); + NSInteger IndexOfItem (NSObject obj); [Export ("indexOfItemWithSubmenu:")] - int IndexOfItem (NSMenu submenu); + NSInteger IndexOfItem (NSMenu submenu); [Export ("indexOfItemWithTarget:andAction:")] - int IndexOfItem (NSObject target, Selector actionSelector); + NSInteger IndexOfItem (NSObject target, Selector actionSelector); [Export ("itemWithTitle:")] NSMenuItem ItemWithTitle (string title); [Export ("itemWithTag:")] - NSMenuItem ItemWithTag (int tag); + NSMenuItem ItemWithTag (NSInteger tag); [Export ("update")] void Update (); @@ -5430,10 +5508,10 @@ public interface NSMenu { void ItemChanged (NSMenuItem item); [Export ("performActionForItemAtIndex:")] - void PerformActionForItem (int index); + void PerformActionForItem (NSInteger index); [Export ("menuBarHeight")] - float MenuBarHeight { get; } + CGFloat MenuBarHeight { get; } [Export ("cancelTracking")] void CancelTracking (); @@ -5445,7 +5523,7 @@ public interface NSMenu { NSMenuItem HighlightedItem { get; } [Export ("size")] - SizeF Size { get; } + NSSize Size { get; } // TODO: Bind NSZone //[Static] @@ -5479,7 +5557,7 @@ public interface NSMenu { NSMenuDelegate Delegate { get; set; } [Export ("minimumWidth")] - float MinimumWidth { get; set; } + CGFloat MinimumWidth { get; set; } [Export ("font")] NSFont Font { get; set; } @@ -5504,10 +5582,10 @@ public interface NSMenuDelegate { void NeedsUpdate (NSMenu menu); [Export ("numberOfItemsInMenu:")] - int MenuItemCount (NSMenu menu); + NSInteger MenuItemCount (NSMenu menu); [Export ("menu:updateItem:atIndex:shouldCancel:")] - bool UpdateItem (NSMenu menu, NSMenuItem item, int atIndex, bool shouldCancel); + bool UpdateItem (NSMenu menu, NSMenuItem item, NSInteger atIndex, bool shouldCancel); [Export ("menuHasKeyEquivalent:forEvent:target:action:")] bool HasKeyEquivalentForEvent (NSMenu menu, NSEvent theEvent, NSObject target, Selector action); @@ -5523,7 +5601,7 @@ public interface NSMenuDelegate { void MenuWillHighlightItem (NSMenu menu, NSMenuItem item); [Export ("confinementRectForMenu:onScreen:")] - RectangleF ConfinementRectForMenu (NSMenu menu, NSScreen screen); + NSRect ConfinementRectForMenu (NSMenu menu, NSScreen screen); } [BaseType (typeof (NSObject))] @@ -5601,7 +5679,7 @@ public interface NSMenuItem { bool Alternate { [Bind ("isAlternate")]get; set; } [Export ("indentationLevel")] - int IndentationLevel { get; set; } + NSInteger IndentationLevel { get; set; } [Export ("target"), NullAllowed] NSObject Target { get; set; } @@ -5610,7 +5688,7 @@ public interface NSMenuItem { Selector Action { get; set; } [Export ("tag")] - int Tag { get; set; } + NSInteger Tag { get; set; } [Export ("representedObject")] NSObject RepresentedObject { get; set; } @@ -5637,46 +5715,46 @@ public interface NSMenuItemCell { void CalcSize (); [Export ("stateImageWidth")] - float StateImageWidth (); + CGFloat StateImageWidth (); [Export ("imageWidth")] - float ImageWidth { get; } + CGFloat ImageWidth { get; } [Export ("titleWidth")] - float TitleWidth { get; } + CGFloat TitleWidth { get; } [Export ("keyEquivalentWidth")] - float KeyEquivalentWidth { get; } + CGFloat KeyEquivalentWidth { get; } [Export ("stateImageRectForBounds:")] - RectangleF StateImageRectForBounds (RectangleF cellFrame); + NSRect StateImageRectForBounds (NSRect cellFrame); [Export ("titleRectForBounds:")] - RectangleF TitleRectForBounds (RectangleF cellFrame); + NSRect TitleRectForBounds (NSRect cellFrame); [Export ("keyEquivalentRectForBounds:")] - RectangleF KeyEquivalentRectForBounds (RectangleF cellFrame); + NSRect KeyEquivalentRectForBounds (NSRect cellFrame); [Export ("drawSeparatorItemWithFrame:inView:")] - void DrawSeparatorItem (RectangleF cellFrame, NSView controlView); + void DrawSeparatorItem (NSRect cellFrame, NSView controlView); [Export ("drawStateImageWithFrame:inView:")] - void DrawStateImage (RectangleF cellFrame, NSView controlView); + void DrawStateImage (NSRect cellFrame, NSView controlView); [Export ("drawImageWithFrame:inView:")] - void DrawImage (RectangleF cellFrame, NSView controlView); + void DrawImage (NSRect cellFrame, NSView controlView); [Export ("drawTitleWithFrame:inView:")] - void DrawTitle (RectangleF cellFrame, NSView controlView); + void DrawTitle (NSRect cellFrame, NSView controlView); [Export ("drawKeyEquivalentWithFrame:inView:")] - void DrawKeyEquivalent (RectangleF cellFrame, NSView controlView); + void DrawKeyEquivalent (NSRect cellFrame, NSView controlView); [Export ("drawBorderAndBackgroundWithFrame:inView:")] - void DrawBorderAndBackground (RectangleF cellFrame, NSView controlView); + void DrawBorderAndBackground (NSRect cellFrame, NSView controlView); [Export ("tag")] - int Tag { get; } + NSInteger Tag { get; } //Detected properties [Export ("menuItem")] @@ -5697,13 +5775,13 @@ public interface NSMenuItemCell { public interface NSMenuView { [Static] [Export ("menuBarHeight")] - float MenuBarHeight { get; } + CGFloat MenuBarHeight { get; } [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frame); + IntPtr Constructor (NSRect frame); [Export ("initAsTearOff")] - IntPtr Constructor (int tokenInitAsTearOff); + IntPtr Constructor (NSInteger tokenInitAsTearOff); [Export ("itemChanged:")] void ItemChanged (NSNotification notification); @@ -5718,40 +5796,40 @@ public interface NSMenuView { void Update (); [Export ("innerRect")] - RectangleF InnerRect { get; } + NSRect InnerRect { get; } [Export ("rectOfItemAtIndex:")] - RectangleF RectOfItemAtIndex (int index); + NSRect RectOfItemAtIndex (NSInteger index); [Export ("indexOfItemAtPoint:")] - int IndexOfItemAtPoint (PointF point); + NSInteger IndexOfItemAtPoint (NSPoint point); [Export ("setNeedsDisplayForItemAtIndex:")] - void SetNeedsDisplay (int itemAtIndex); + void SetNeedsDisplay (NSInteger itemAtIndex); [Export ("stateImageOffset")] - float StateImageOffset { get; } + CGFloat StateImageOffset { get; } [Export ("stateImageWidth")] - float StateImageWidth { get; } + CGFloat StateImageWidth { get; } [Export ("imageAndTitleOffset")] - float ImageAndTitleOffset { get; } + CGFloat ImageAndTitleOffset { get; } [Export ("imageAndTitleWidth")] - float ImageAndTitleWidth { get; } + CGFloat ImageAndTitleWidth { get; } [Export ("keyEquivalentOffset")] - float KeyEquivalentOffset { get; } + CGFloat KeyEquivalentOffset { get; } [Export ("keyEquivalentWidth")] - float KeyEquivalentWidth { get; } + CGFloat KeyEquivalentWidth { get; } [Export ("setMenuItemCell:forItemAtIndex:")] - void SetMenuItemCell (NSMenuItemCell cell, int itemAtIndex); + void SetMenuItemCell (NSMenuItemCell cell, NSInteger itemAtIndex); [Export ("menuItemCellForItemAtIndex:")] - NSMenuItemCell GetMenuItemCell (int itemAtIndex); + NSMenuItemCell GetMenuItemCell (NSInteger itemAtIndex); [Export ("attachedMenuView")] NSMenuView AttachedMenuView { get; } @@ -5769,19 +5847,19 @@ public interface NSMenuView { bool IsTornOff { get; } [Export ("locationForSubmenu:")] - PointF LocationForSubmenu (NSMenu aSubmenu); + NSPoint LocationForSubmenu (NSMenu aSubmenu); [Export ("setWindowFrameForAttachingToRect:onScreen:preferredEdge:popUpSelectedItem:")] - void SetWindowFrameForAttachingToRect (RectangleF screenRect, NSScreen onScreen, NSRectEdge preferredEdge, int popupSelectedItem); + void SetWindowFrameForAttachingToRect (NSRect screenRect, NSScreen onScreen, NSRectEdge preferredEdge, NSInteger popupSelectedItem); [Export ("detachSubmenu")] void DetachSubmenu (); [Export ("attachSubmenuForItemAtIndex:")] - void AttachSubmenuForItemAtIndex (int index); + void AttachSubmenuForItemAtIndex (NSInteger index); [Export ("performActionWithHighlightingForItemAtIndex:")] - void PerformActionWithHighlighting (int forItemAtIndex); + void PerformActionWithHighlighting (NSInteger forItemAtIndex); [Export ("trackWithEvent:")] bool TrackWithEvent (NSEvent theEvent); @@ -5797,13 +5875,13 @@ public interface NSMenuView { NSFont Font { get; set; } [Export ("highlightedItemIndex")] - int HighlightedItemIndex { get; set; } + NSInteger HighlightedItemIndex { get; set; } [Export ("needsSizing")] bool NeedsSizing { get; set; } [Export ("horizontalEdgePadding")] - float HorizontalEdgePadding { get; set; } + CGFloat HorizontalEdgePadding { get; set; } } [BaseType (typeof (NSObject))] @@ -6029,10 +6107,10 @@ public partial interface NSOpenGLView { NSOpenGLPixelFormat DefaultPixelFormat { get; } [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("initWithFrame:pixelFormat:")] - IntPtr Constructor (RectangleF frameRect, NSOpenGLPixelFormat format); + IntPtr Constructor (NSRect frameRect, NSOpenGLPixelFormat format); [Export ("clearGLContext")] void ClearGLContext (); @@ -6092,11 +6170,11 @@ public interface NSOpenPanel { [Obsolete ("On 10.6 and newer use runModal:")] [Export ("runModalForDirectory:file:types:")] - int RunModal ([NullAllowed] string directory, [NullAllowed] string fileName, [NullAllowed] string [] types); + NSInteger RunModal ([NullAllowed] string directory, [NullAllowed] string fileName, [NullAllowed] string [] types); [Obsolete ("On 10.6 and newer use runModal:")] [Export ("runModalForTypes:")] - int RunModal (string [] types); + NSInteger RunModal (string [] types); } [BaseType (typeof (NSOpenPanel))] @@ -6172,22 +6250,22 @@ public partial interface NSOutlineView { NSObject GetParent (NSObject item); [Export ("itemAtRow:")] - NSObject ItemAtRow (int row); + NSObject ItemAtRow (NSInteger row); [Export ("rowForItem:")] - int RowForItem (NSObject item); + NSInteger RowForItem (NSObject item); [Export ("levelForItem:")] - int LevelForItem ([NullAllowed] NSObject item); + NSInteger LevelForItem ([NullAllowed] NSObject item); [Export ("levelForRow:")] - int LevelForRow (int row); + NSInteger LevelForRow (NSInteger row); [Export ("isItemExpanded:")] bool IsItemExpanded (NSObject item); [Export ("indentationPerLevel")] - float IndentationPerLevel { get; set; } + CGFloat IndentationPerLevel { get; set; } [Export ("indentationMarkerFollowsCell")] bool IndentationMarkerFollowsCell { get; set; } @@ -6196,10 +6274,10 @@ public partial interface NSOutlineView { bool AutoresizesOutlineColumn { get; set; } [Export ("frameOfOutlineCellAtRow:")] - RectangleF FrameOfOutlineCellAtRow (int row); + NSRect FrameOfOutlineCellAtRow (NSInteger row); [Export ("setDropItem:dropChildIndex:")] - void SetDropItem (NSObject item, int index); + void SetDropItem (NSObject item, NSInteger index); [Export ("shouldCollapseAutoExpandedItemsForDeposited:")] bool ShouldCollapseAutoExpandedItems (bool forDeposited); @@ -6252,10 +6330,10 @@ public partial interface NSOutlineViewDelegate { //FIXME: Binding NSRectPointer //[Export ("outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:")] - //string ToolTipForCell (NSOutlineView outlineView, NSCell cell, NSRectPointer rect, NSTableColumn tableColumn, NSObject item, PointF mouseLocation); + //string ToolTipForCell (NSOutlineView outlineView, NSCell cell, NSRectPointer rect, NSTableColumn tableColumn, NSObject item, NSPoint mouseLocation); [Export ("outlineView:heightOfRowByItem:"), NoDefaultValue] - float GetRowHeight (NSOutlineView outlineView, NSObject item); + CGFloat GetRowHeight (NSOutlineView outlineView, NSObject item); [Export ("outlineView:typeSelectStringForTableColumn:item:")] string GetSelectString (NSOutlineView outlineView, NSTableColumn tableColumn, NSObject item); @@ -6291,10 +6369,10 @@ public partial interface NSOutlineViewDelegate { void WillDisplayOutlineCell (NSOutlineView outlineView, NSObject cell, NSTableColumn tableColumn, NSObject item); [Export ("outlineView:sizeToFitWidthOfColumn:"), NoDefaultValue] - float GetSizeToFitColumnWidth (NSOutlineView outlineView, int column); + CGFloat GetSizeToFitColumnWidth (NSOutlineView outlineView, NSInteger column); [Export ("outlineView:shouldReorderColumn:toColumn:")] - bool ShouldReorder (NSOutlineView outlineView, int columnIndex, int newColumnIndex); + bool ShouldReorder (NSOutlineView outlineView, NSInteger columnIndex, NSInteger newColumnIndex); [Export ("outlineView:shouldShowOutlineCellForItem:")] bool ShouldShowOutlineCell (NSOutlineView outlineView, NSObject item); @@ -6328,13 +6406,13 @@ public partial interface NSOutlineViewDelegate { [Model] public partial interface NSOutlineViewDataSource { [Export ("outlineView:child:ofItem:")] - NSObject GetChild (NSOutlineView outlineView, int childIndex, NSObject item); + NSObject GetChild (NSOutlineView outlineView, NSInteger childIndex, NSObject item); [Export ("outlineView:isItemExpandable:")] bool ItemExpandable (NSOutlineView outlineView, NSObject item); [Export ("outlineView:numberOfChildrenOfItem:")] - int GetChildrenCount (NSOutlineView outlineView, NSObject item); + NSInteger GetChildrenCount (NSOutlineView outlineView, NSObject item); [Export ("outlineView:objectValueForTableColumn:byItem:")] NSObject GetObjectValue (NSOutlineView outlineView, NSTableColumn tableColumn, NSObject item); @@ -6355,10 +6433,10 @@ public partial interface NSOutlineViewDataSource { bool OutlineViewwriteItemstoPasteboard (NSOutlineView outlineView, NSArray items, NSPasteboard pboard); [Export ("outlineView:validateDrop:proposedItem:proposedChildIndex:")] - NSDragOperation ValidateDrop (NSOutlineView outlineView, NSDraggingInfo info, NSObject item, int index); + NSDragOperation ValidateDrop (NSOutlineView outlineView, NSDraggingInfo info, NSObject item, NSInteger index); [Export ("outlineView:acceptDrop:item:childIndex:")] - bool AcceptDrop (NSOutlineView outlineView, NSDraggingInfo info, NSObject item, int index); + bool AcceptDrop (NSOutlineView outlineView, NSDraggingInfo info, NSObject item, NSInteger index); [Export ("outlineView:namesOfPromisedFilesDroppedAtDestination:forDraggedItems:")] string [] FilesDropped (NSOutlineView outlineView, NSUrl dropDestination, NSArray items); @@ -6381,7 +6459,7 @@ public interface NSHelpManager { NSAttributedString Context (NSObject theObject); [Export ("showContextHelpForObject:locationHint:")] - bool ShowContext (NSObject theObject, PointF pt); + bool ShowContext (NSObject theObject, NSPoint pt); [Export ("openHelpAnchor:inBook:")] void OpenHelpAnchor (string anchor, string book); @@ -6405,7 +6483,7 @@ public partial interface NSImage { NSImage ImageNamed (string name); [Export ("initWithSize:")] - IntPtr Constructor (SizeF aSize); + IntPtr Constructor (NSSize aSize); [Export ("initWithData:")] IntPtr Constructor (NSData data); @@ -6432,16 +6510,16 @@ public partial interface NSImage { //IntPtr Constructor (NSData data); [Export ("drawAtPoint:fromRect:operation:fraction:")] - void Draw (PointF point, RectangleF fromRect, NSCompositingOperation op, float delta); + void Draw (NSPoint point, NSRect fromRect, NSCompositingOperation op, CGFloat delta); [Export ("drawInRect:fromRect:operation:fraction:")] - void Draw (RectangleF rect, RectangleF fromRect, NSCompositingOperation op, float delta); + void Draw (NSRect rect, NSRect fromRect, NSCompositingOperation op, CGFloat delta); [Export ("drawInRect:fromRect:operation:fraction:respectFlipped:hints:")] - void Draw (RectangleF dstSpacePortionRect, RectangleF srcSpacePortionRect, NSCompositingOperation op, float requestedAlpha, bool respectContextIsFlipped, [NullAllowed] NSDictionary hints); + void Draw (NSRect dstSpacePortionRect, NSRect srcSpacePortionRect, NSCompositingOperation op, CGFloat requestedAlpha, bool respectContextIsFlipped, [NullAllowed] NSDictionary hints); [Export ("drawRepresentation:inRect:")] - bool Draw (NSImageRep imageRep, RectangleF rect); + bool Draw (NSImageRep imageRep, NSRect rect); [Export ("recache")] void Recache (); @@ -6450,7 +6528,7 @@ public partial interface NSImage { NSData AsTiff (); [Export ("TIFFRepresentationUsingCompression:factor:")] - NSData AsTiff (NSTiffCompression comp, float aFloat); + NSData AsTiff (NSTiffCompression comp, CGFloat aFloat); [Export ("representations")] NSImageRep [] Representations (); @@ -6514,20 +6592,20 @@ public partial interface NSImage { string AccessibilityDescription { get; set; } [Export ("initWithCGImage:size:")] - IntPtr Constructor (CGImage cgImage, SizeF size); + IntPtr Constructor (CGImage cgImage, NSSize size); [Export ("CGImageForProposedRect:context:hints:")] - CGImage AsCGImage (ref RectangleF proposedDestRect, [NullAllowed] NSGraphicsContext referenceContext, [NullAllowed] NSDictionary hints); + CGImage AsCGImage (ref NSRect proposedDestRect, [NullAllowed] NSGraphicsContext referenceContext, [NullAllowed] NSDictionary hints); [Export ("bestRepresentationForRect:context:hints:")] - NSImageRep BestRepresentation (RectangleF rect, [NullAllowed] NSGraphicsContext referenceContext, [NullAllowed] NSDictionary hints); + NSImageRep BestRepresentation (NSRect rect, [NullAllowed] NSGraphicsContext referenceContext, [NullAllowed] NSDictionary hints); [Export ("hitTestRect:withImageDestinationRect:context:hints:flipped:")] - bool HitTestRect (RectangleF testRectDestSpace, RectangleF imageRectDestSpace, NSGraphicsContext context, NSDictionary hints, bool flipped); + bool HitTestRect (NSRect testRectDestSpace, NSRect imageRectDestSpace, NSGraphicsContext context, NSDictionary hints, bool flipped); //Detected properties [Export ("size")] - SizeF Size { get; set; } + NSSize Size { get; set; } [Export ("name"), Internal] string GetName (); @@ -6557,19 +6635,19 @@ public partial interface NSImage { NSImageCacheMode CacheMode { get; set; } [Export ("alignmentRect")] - RectangleF AlignmentRect { get; set; } + NSRect AlignmentRect { get; set; } [Export ("template")] bool Template { [Bind ("isTemplate")]get; set; } [Bind ("sizeWithAttributes:")] - SizeF StringSize ([Target] string str, NSDictionary attributes); + NSSize StringSize ([Target] string str, NSDictionary attributes); [Bind ("drawInRect:withAttributes:")] - void DrawInRect ([Target] string str, RectangleF rect, NSDictionary attributes); + void DrawInRect ([Target] string str, NSRect rect, NSDictionary attributes); [Export ("drawInRect:fromRect:operation:fraction:")] - void DrawInRect (RectangleF dstRect, RectangleF srcRect, NSCompositingOperation operation, float delta); + void DrawInRect (NSRect dstRect, NSRect srcRect, NSCompositingOperation operation, CGFloat delta); [Obsolete ("On 10.6 and newer use DrawInRect with respectContextIsFlipped instead"), Export ("flipped")] bool Flipped { [Bind ("isFlipped")] get; set; } @@ -6579,7 +6657,7 @@ public partial interface NSImage { [Model] public interface NSImageDelegate { [Export ("imageDidNotDraw:inRect:"), DelegateName ("NSImageRect"), DefaultValue (null)] - NSImage ImageDidNotDraw (NSObject sender, RectangleF aRect); + NSImage ImageDidNotDraw (NSObject sender, NSRect aRect); [Export ("image:willLoadRepresentation:"), EventArgs ("NSImageLoad")] void WillLoadRepresentation (NSImage image, NSImageRep rep); @@ -6588,7 +6666,7 @@ public interface NSImageDelegate { void DidLoadRepresentationHeader (NSImage image, NSImageRep rep); [Export ("image:didLoadPartOfRepresentation:withValidRows:"), EventArgs ("NSImagePartial")] - void DidLoadPartOfRepresentation (NSImage image, NSImageRep rep, int rows); + void DidLoadPartOfRepresentation (NSImage image, NSImageRep rep, NSInteger rows); [Export ("image:didLoadRepresentation:withStatus:"), EventArgs ("NSImageLoadRepresentation")] void DidLoadRepresentation (NSImage image, NSImageRep rep, NSImageLoadStatus status); @@ -6613,13 +6691,13 @@ public interface NSImageRep { bool Draw (); [Export ("drawAtPoint:")] - bool DrawAtPoint (PointF point); + bool DrawAtPoint (NSPoint point); [Export ("drawInRect:")] - bool DrawInRect (RectangleF rect); + bool DrawInRect (NSRect rect); [Export ("drawInRect:fromRect:operation:fraction:respectFlipped:hints:")] - bool DrawInRect (RectangleF dstSpacePortionRect, RectangleF srcSpacePortionRect, NSCompositingOperation op, float requestedAlpha, bool respectContextIsFlipped, NSDictionary hints); + bool DrawInRect (NSRect dstSpacePortionRect, NSRect srcSpacePortionRect, NSCompositingOperation op, CGFloat requestedAlpha, bool respectContextIsFlipped, NSDictionary hints); [Export ("setAlpha:")] void SetAlpha (bool alpha); @@ -6712,11 +6790,11 @@ public interface NSImageRep { NSImageRep ImageRepFromPasteboard (NSPasteboard pasteboard); [Export ("CGImageForProposedRect:context:hints:")] - CGImage AsCGImage (ref RectangleF proposedDestRect, [NullAllowed] NSGraphicsContext context, [NullAllowed] NSDictionary hints); + CGImage AsCGImage (ref NSRect proposedDestRect, [NullAllowed] NSGraphicsContext context, [NullAllowed] NSDictionary hints); //Detected properties [Export ("size")] - SizeF Size { get; set; } + NSSize Size { get; set; } [Export ("opaque")] bool Opaque { [Bind ("isOpaque")]get; set; } @@ -6725,19 +6803,19 @@ public interface NSImageRep { string ColorSpaceName { get; set; } [Export ("bitsPerSample")] - int BitsPerSample { get; set; } + NSInteger BitsPerSample { get; set; } [Export ("pixelsWide")] - int PixelsWide { get; set; } + NSInteger PixelsWide { get; set; } [Export ("pixelsHigh")] - int PixelsHigh { get; set; } + NSInteger PixelsHigh { get; set; } } [BaseType (typeof (NSControl))] public interface NSImageView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); //Detected properties [Export ("image")] @@ -6765,16 +6843,16 @@ public interface NSImageView { [BaseType (typeof (NSControl), Delegates=new string [] { "WeakDelegate" }, Events=new Type [] { typeof (NSMatrixDelegate)})] public partial interface NSMatrix { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("initWithFrame:mode:prototype:numberOfRows:numberOfColumns:")] - IntPtr Constructor (RectangleF frameRect, NSMatrixMode aMode, NSCell aCell, int rowsHigh, int colsWide); + IntPtr Constructor (NSRect frameRect, NSMatrixMode aMode, NSCell aCell, NSInteger rowsHigh, NSInteger colsWide); [Export ("initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:")] - IntPtr Constructor (RectangleF frameRect, NSMatrixMode aMode, Class factoryId, int rowsHigh, int colsWide); + IntPtr Constructor (NSRect frameRect, NSMatrixMode aMode, Class factoryId, NSInteger rowsHigh, NSInteger colsWide); [Export ("makeCellAtRow:column:")] - NSCell MakeCell (int row, int col); + NSCell MakeCell (NSInteger row, NSInteger col); [Export ("sendAction:to:forAllCells:")] void SendAction (Selector aSelector, NSObject anObject, bool forAllCells); @@ -6797,13 +6875,13 @@ public partial interface NSMatrix { NSCell [] SelectedCells { get; } [Export ("selectedRow")] - int SelectedRow { get; } + NSInteger SelectedRow { get; } [Export ("selectedColumn")] - int SelectedColumn { get; } + NSInteger SelectedColumn { get; } [Export ("setSelectionFrom:to:anchor:highlight:")] - void SetSelection (int startPos, int endPos, int anchorPos, bool highlight); + void SetSelection (NSInteger startPos, NSInteger endPos, NSInteger anchorPos, bool highlight); [Export ("deselectSelectedCell")] void DeselectSelectedCell (); @@ -6812,46 +6890,46 @@ public partial interface NSMatrix { void DeselectAllCells (); [Export ("selectCellAtRow:column:")] - void SelectCell (int row, int column); + void SelectCell (NSInteger row, NSInteger column); [Export ("selectAll:")] void SelectAll (NSObject sender); [Export ("selectCellWithTag:")] - bool SelectCellWithTag (int tag); + bool SelectCellWithTag (NSInteger tag); [Export ("setScrollable:")] void SetScrollable (bool flag); [Export ("setState:atRow:column:")] - void SetState (int state, int row, int column); + void SetState (NSInteger state, NSInteger row, NSInteger column); [Export ("getNumberOfRows:columns:")] - void GetRowsAndColumnsCount (out int rowCount, out int colCount); + void GetRowsAndColumnsCount (out NSInteger rowCount, out NSInteger colCount); [Export ("numberOfRows")] - int Rows { get; } + NSInteger Rows { get; } [Export ("numberOfColumns")] - int Columns { get; } + NSInteger Columns { get; } [Export ("cellAtRow:column:")][Internal] - NSCell CellAtRowColumn (int row, int column); + NSCell CellAtRowColumn (NSInteger row, NSInteger column); [Export ("cellFrameAtRow:column:")] - RectangleF CellFrameAtRowColumn (int row, int column); + NSRect CellFrameAtRowColumn (NSInteger row, NSInteger column); [Export ("getRow:column:ofCell:")] - bool GetRowColumn (out int row, out int column, NSCell aCell); + bool GetRowColumn (out NSInteger row, out NSInteger column, NSCell aCell); [Export ("getRow:column:forPoint:")] - bool GetRowColumnForPoint (out int row, out int column, PointF aPoint); + bool GetRowColumnForPoint (out NSInteger row, out NSInteger column, NSPoint aPoint); [Export ("renewRows:columns:")] - void RenewRowsColumns (int newRows, int newCols); + void RenewRowsColumns (NSInteger newRows, NSInteger newCols); [Export ("putCell:atRow:column:")] - void PutCell (NSCell newCell, int row, int column); + void PutCell (NSCell newCell, NSInteger row, NSInteger column); [Export ("addRow")] void AddRow (); @@ -6860,13 +6938,13 @@ public partial interface NSMatrix { void AddRowWithCells (NSCell [] newCells); [Export ("insertRow:")] - void InsertRow (int row); + void InsertRow (NSInteger row); [Export ("insertRow:withCells:")] - void InsertRow (int row, NSCell [] newCells); + void InsertRow (NSInteger row, NSCell [] newCells); [Export ("removeRow:")] - void RemoveRow (int row); + void RemoveRow (NSInteger row); [Export ("addColumn")] void AddColumn (); @@ -6875,16 +6953,16 @@ public partial interface NSMatrix { void AddColumnWithCells (NSCell [] newCells); [Export ("insertColumn:")] - void InsertColumn (int column); + void InsertColumn (NSInteger column); [Export ("insertColumn:withCells:")] - void InsertColumn (int column, NSCell [] newCells); + void InsertColumn (NSInteger column, NSCell [] newCells); [Export ("removeColumn:")] - void RemoveColumn (int col); + void RemoveColumn (NSInteger col); [Export ("cellWithTag:")] - NSCell CellWithTag (int anInt); + NSCell CellWithTag (NSInteger anInt); [Export ("sizeToCells")] void SizeToCells (); @@ -6893,16 +6971,16 @@ public partial interface NSMatrix { void SetValidateSize (bool flag); [Export ("drawCellAtRow:column:")] - void DrawCellAtRowColumn (int row, int column); + void DrawCellAtRowColumn (NSInteger row, NSInteger column); [Export ("highlightCell:atRow:column:")] - void HighlightCell (bool highlight, int row, int column); + void HighlightCell (bool highlight, NSInteger row, NSInteger column); [Export ("scrollCellToVisibleAtRow:column:")] - void ScrollCellToVisible (int row, int column); + void ScrollCellToVisible (NSInteger row, NSInteger column); [Export ("mouseDownFlags")] - int MouseDownFlags (); + NSInteger MouseDownFlags (); [Export ("mouseDown:")] void MouseDown (NSEvent theEvent); @@ -6935,7 +7013,7 @@ public partial interface NSMatrix { void SelectText (NSObject sender); [Export ("selectTextAtRow:column:")] - NSObject SelectTextAtRowColumn (int row, int column); + NSObject SelectTextAtRowColumn (NSInteger row, NSInteger column); [Export ("acceptsFirstMouse:")] bool AcceptsFirstMouse (NSEvent theEvent); @@ -6966,10 +7044,10 @@ public partial interface NSMatrix { bool SelectionByRect { [Bind ("isSelectionByRect")]get; set; } [Export ("cellSize")] - SizeF CellSize { get; set; } + NSSize CellSize { get; set; } [Export ("intercellSpacing")] - SizeF IntercellSpacing { get; set; } + NSSize IntercellSpacing { get; set; } [Export ("backgroundColor")] NSColor BackgroundColor { get; set; } @@ -7009,7 +7087,7 @@ public partial interface NSMatrix { [BaseType (typeof (NSControl))] public interface NSLevelIndicator { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("minValue")] double MinValue { get; set; } @@ -7027,16 +7105,16 @@ public interface NSLevelIndicator { NSTickMarkPosition TickMarkPosition { get; set; } [Export ("numberOfTickMarks")] - int TickMarkCount { get; set; } + NSInteger TickMarkCount { get; set; } [Export ("numberOfMajorTickMarks")] - int MajorTickMarkCount { get; set; } + NSInteger MajorTickMarkCount { get; set; } [Export ("tickMarkValueAtIndex:")] - double TickMarkValueAt (int index); + double TickMarkValueAt (NSInteger index); [Export ("rectOfTickMarkAtIndex:")] - RectangleF RectOfTickMark (int index); + NSRect RectOfTickMark (NSInteger index); } [BaseType (typeof (NSActionCell))] @@ -7069,16 +7147,16 @@ public interface NSLevelIndicatorCell { NSTickMarkPosition TickMarkPosition { get; set; } [Export ("numberOfTickMarks")] - int TickMarkCount { get; set; } + NSInteger TickMarkCount { get; set; } [Export ("numberOfMajorTickMarks")] - int MajorTickMarkCount { get; set; } + NSInteger MajorTickMarkCount { get; set; } [Export ("rectOfTickMarkAtIndex:")] - RectangleF RectOfTickMarkAt (int index); + NSRect RectOfTickMarkAt (NSInteger index); [Export ("tickMarkValueAtIndex:")] - double TickMarkValueAt (int index); + double TickMarkValueAt (NSInteger index); [Export ("setImage:")] void SetImage (NSImage image); @@ -7093,7 +7171,7 @@ public interface NSLayoutConstraint : NSAnimatablePropertyContainer { [Static] [Export ("constraintWithItem:attribute:relatedBy:toItem:attribute:multiplier:constant:")] - NSLayoutConstraint Create (NSObject view1, NSLayoutAttribute attribute1, NSLayoutRelation relation, NSObject view2, NSLayoutAttribute attribute2, float multiplier, float constant); + NSLayoutConstraint Create (NSObject view1, NSLayoutAttribute attribute1, NSLayoutRelation relation, NSObject view2, NSLayoutAttribute attribute2, CGFloat multiplier, CGFloat constant); [Export ("priority")] float Priority { get; set; } @@ -7117,10 +7195,10 @@ public interface NSLayoutConstraint : NSAnimatablePropertyContainer { NSLayoutAttribute SecondAttribute { get; } [Export ("multiplier")] - float Multiplier { get; } + CGFloat Multiplier { get; } [Export ("constant")] - float Constant { get; set; } + CGFloat Constant { get; set; } } [BaseType (typeof (NSObject))] @@ -7138,10 +7216,10 @@ public partial interface NSLayoutManager { void AddTextContainer (NSTextContainer container); [Export ("insertTextContainer:atIndex:")] - void InsertTextContainer (NSTextContainer container, int index); + void InsertTextContainer (NSTextContainer container, NSInteger index); [Export ("removeTextContainerAtIndex:")] - void RemoveTextContainer (int index); + void RemoveTextContainer (NSInteger index); [Export ("textContainerChangedGeometry:")] void TextContainerChangedGeometry (NSTextContainer container); @@ -7171,7 +7249,7 @@ public partial interface NSLayoutManager { void InvalidateDisplayForGlyphRange (NSRange glyphRange); [Export ("textStorage:edited:range:changeInLength:invalidatedRange:")] - void TextStorageEdited (NSTextStorage str, NSTextStorageEditedFlags editedMask, NSRange newCharRange, int changeInLength, NSRange invalidatedCharRange); + void TextStorageEdited (NSTextStorage str, NSTextStorageEditedFlags editedMask, NSRange newCharRange, NSInteger changeInLength, NSRange invalidatedCharRange); [Export ("ensureGlyphsForCharacterRange:")] void EnsureGlyphsForCharacterRange (NSRange charRange); @@ -7189,154 +7267,154 @@ public partial interface NSLayoutManager { void EnsureLayoutForTextContainer (NSTextContainer container); [Export ("ensureLayoutForBoundingRect:inTextContainer:")] - void EnsureLayoutForBoundingRect (RectangleF bounds, NSTextContainer container); + void EnsureLayoutForBoundingRect (NSRect bounds, NSTextContainer container); //[Export ("insertGlyphs:length:forStartingGlyphAtIndex:characterIndex:")] //void InsertGlyphs (uint [] glyphs, int length, int glyphIndex, int charIndex); [Export ("insertGlyph:atGlyphIndex:characterIndex:")] - void InsertGlyph (uint glyph, int glyphIndex, int charIndex); + void InsertGlyph (NSUInteger glyph, NSInteger glyphIndex, NSInteger charIndex); [Export ("replaceGlyphAtIndex:withGlyph:")] - void ReplaceGlyphAtIndex (int glyphIndex, uint newGlyph); + void ReplaceGlyphAtIndex (NSInteger glyphIndex, NSUInteger newGlyph); [Export ("deleteGlyphsInRange:")] void DeleteGlyphs (NSRange glyphRange); [Export ("setCharacterIndex:forGlyphAtIndex:")] - void SetCharacterIndex (int charIndex, int glyphIndex); + void SetCharacterIndex (NSInteger charIndex, NSInteger glyphIndex); [Export ("setIntAttribute:value:forGlyphAtIndex:")] - void SetIntAttribute (int attributeTag, int value, int glyphIndex); + void SetIntAttribute (NSInteger attributeTag, NSInteger value, NSInteger glyphIndex); [Export ("invalidateGlyphsOnLayoutInvalidationForGlyphRange:")] void InvalidateGlyphsOnLayoutInvalidation (NSRange glyphRange); [Export ("numberOfGlyphs")] - int NumberOfGlyphs { get; } + NSInteger NumberOfGlyphs { get; } [Export ("glyphAtIndex:isValidIndex:")] - uint GlyphAtIndexisValidIndex (uint glyphIndex, ref bool isValidIndex); + NSUInteger GlyphAtIndexisValidIndex (NSUInteger glyphIndex, ref bool isValidIndex); [Export ("glyphAtIndex:")] - uint GlyphCount (int glyphIndex); + NSUInteger GlyphCount (NSInteger glyphIndex); [Export ("isValidGlyphIndex:")] - bool IsValidGlyphIndex (int glyphIndex); + bool IsValidGlyphIndex (NSInteger glyphIndex); [Export ("characterIndexForGlyphAtIndex:")] - uint CharacterIndexForGlyphAtIndex (int glyphIndex); + NSUInteger CharacterIndexForGlyphAtIndex (NSInteger glyphIndex); [Export ("glyphIndexForCharacterAtIndex:")] - uint GlyphIndexForCharacterAtIndex (int charIndex); + NSUInteger GlyphIndexForCharacterAtIndex (NSInteger charIndex); [Export ("intAttribute:forGlyphAtIndex:")] - int IntAttributeforGlyphAtIndex (int attributeTag, int glyphIndex); + NSInteger IntAttributeforGlyphAtIndex (NSInteger attributeTag, NSInteger glyphIndex); // TODO: bind this with a safe version [Export ("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:"), Internal] - int GetGlyphs (NSRange glyphRange, IntPtr glyphBuffer, IntPtr charIndexBuffer, IntPtr inscribeBuffer, IntPtr elasticBuffer); + NSInteger GetGlyphs (NSRange glyphRange, IntPtr glyphBuffer, IntPtr charIndexBuffer, IntPtr inscribeBuffer, IntPtr elasticBuffer); // TODO: bind this with a safe version [Internal, Export ("getGlyphsInRange:glyphs:characterIndexes:glyphInscriptions:elasticBits:bidiLevels:")] - int GetGlyphs (NSRange glyphRange, IntPtr glyphBuffer, IntPtr charIndexBuffer, IntPtr inscribeBuffer, IntPtr elasticBuffer, IntPtr bidiLevelBuffer); + NSInteger GetGlyphs (NSRange glyphRange, IntPtr glyphBuffer, IntPtr charIndexBuffer, IntPtr inscribeBuffer, IntPtr elasticBuffer, IntPtr bidiLevelBuffer); // TODO: bidn this with a safe version [Internal, Export ("getGlyphs:range:")] - uint GetGlyphsrange (IntPtr glyphArray, NSRange glyphRange); + NSUInteger GetGlyphsrange (IntPtr glyphArray, NSRange glyphRange); [Export ("setTextContainer:forGlyphRange:")] void SetTextContainerForRange (NSTextContainer container, NSRange glyphRange); [Export ("setLineFragmentRect:forGlyphRange:usedRect:")] - void SetLineFragmentRect (RectangleF fragmentRect, NSRange glyphRange, RectangleF usedRect); + void SetLineFragmentRect (NSRect fragmentRect, NSRange glyphRange, NSRect usedRect); [Export ("setExtraLineFragmentRect:usedRect:textContainer:")] - void SetExtraLineFragmentRect (RectangleF fragmentRect, RectangleF usedRect, NSTextContainer container); + void SetExtraLineFragmentRect (NSRect fragmentRect, NSRect usedRect, NSTextContainer container); [Export ("setLocation:forStartOfGlyphRange:")] - void SetLocation (PointF location, NSRange forStartOfGlyphRange); + void SetLocation (NSPoint location, NSRange forStartOfGlyphRange); //[Export ("setLocations:startingGlyphIndexes:count:forGlyphRange:")] //void SetLocations (NSPointArray locations, int glyphIndexes, uint count, NSRange glyphRange); [Export ("setNotShownAttribute:forGlyphAtIndex:")] - void SetNotShownAttribute (bool flag, int glyphIndex); + void SetNotShownAttribute (bool flag, NSInteger glyphIndex); [Export ("setDrawsOutsideLineFragment:forGlyphAtIndex:")] - void SetDrawsOutsideLineFragment (bool flag, int glyphIndex); + void SetDrawsOutsideLineFragment (bool flag, NSInteger glyphIndex); [Export ("setAttachmentSize:forGlyphRange:")] - void SetAttachmentSize (SizeF attachmentSize, NSRange glyphRange); + void SetAttachmentSize (NSSize attachmentSize, NSRange glyphRange); [Export ("getFirstUnlaidCharacterIndex:glyphIndex:")] - void GetFirstUnlaidCharacterIndex (ref uint charIndex, ref uint glyphIndex); + void GetFirstUnlaidCharacterIndex (ref NSUInteger charIndex, ref NSUInteger glyphIndex); [Export ("firstUnlaidCharacterIndex")] - int FirstUnlaidCharacterIndex { get; } + NSInteger FirstUnlaidCharacterIndex { get; } [Export ("firstUnlaidGlyphIndex")] - int FirstUnlaidGlyphIndex { get; } + NSInteger FirstUnlaidGlyphIndex { get; } //[Export ("textContainerForGlyphAtIndex:effectiveRange:")] //NSTextContainer TextContainerForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange); [Export ("usedRectForTextContainer:")] - RectangleF GetUsedRectForTextContainer (NSTextContainer container); + NSRect GetUsedRectForTextContainer (NSTextContainer container); //[Export ("lineFragmentRectForGlyphAtIndex:effectiveRange:")] - //RectangleF LineFragmentRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange); + //NSRect LineFragmentRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange); //[Export ("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:")] - //RectangleF LineFragmentUsedRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange); + //NSRect LineFragmentUsedRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange); //[Export ("lineFragmentRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:")] - //RectangleF LineFragmentRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange, bool flag); + //NSRect LineFragmentRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange, bool flag); //[Export ("lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:")] - //RectangleF LineFragmentUsedRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange, bool flag); + //NSRect LineFragmentUsedRectForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange, bool flag); //[Export ("textContainerForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:")] //NSTextContainer TextContainerForGlyphAt (int glyphIndex, NSRangePointer effectiveGlyphRange, bool flag); [Export ("extraLineFragmentRect")] - RectangleF ExtraLineFragmentRect { get; } + NSRect ExtraLineFragmentRect { get; } [Export ("extraLineFragmentUsedRect")] - RectangleF ExtraLineFragmentUsedRect { get; } + NSRect ExtraLineFragmentUsedRect { get; } [Export ("extraLineFragmentTextContainer")] NSTextContainer ExtraLineFragmentTextContainer { get; } [Export ("locationForGlyphAtIndex:")] - PointF LocationForGlyphAtIndex (int glyphIndex); + NSPoint LocationForGlyphAtIndex (NSInteger glyphIndex); [Export ("notShownAttributeForGlyphAtIndex:")] - bool NotShownAttributeForGlyphAtIndex (int glyphIndex); + bool NotShownAttributeForGlyphAtIndex (NSInteger glyphIndex); [Export ("drawsOutsideLineFragmentForGlyphAtIndex:")] - bool DrawsOutsideLineFragmentForGlyphAt (int glyphIndex); + bool DrawsOutsideLineFragmentForGlyphAt (NSInteger glyphIndex); - [Export ("attachmentSizeForGlyphAtIndex:")] - SizeF AttachmentSizeForGlyphAt (int glyphIndex); + [Export ("attachmentNSSizeorGlyphAtIndex:")] + NSSize AttachmentNSSizeorGlyphAt (NSInteger glyphIndex); [Export ("setLayoutRect:forTextBlock:glyphRange:")] - void SetLayoutRect (RectangleF layoutRect, NSTextBlock forTextBlock, NSRange glyphRange); + void SetLayoutRect (NSRect layoutRect, NSTextBlock forTextBlock, NSRange glyphRange); [Export ("setBoundsRect:forTextBlock:glyphRange:")] - void SetBoundsRect (RectangleF boundsRect, NSTextBlock forTextBlock, NSRange glyphRange); + void SetBoundsRect (NSRect boundsRect, NSTextBlock forTextBlock, NSRange glyphRange); [Export ("layoutRectForTextBlock:glyphRange:")] - RectangleF LayoutRect (NSTextBlock block, NSRange glyphRange); + NSRect LayoutRect (NSTextBlock block, NSRange glyphRange); [Export ("boundsRectForTextBlock:glyphRange:")] - RectangleF BoundsRect (NSTextBlock block, NSRange glyphRange); + NSRect BoundsRect (NSTextBlock block, NSRange glyphRange); //[Export ("layoutRectForTextBlock:atIndex:effectiveRange:")] - //RectangleF LayoutRect (NSTextBlock block, int glyphIndex, NSRangePointer effectiveGlyphRange); + //NSRect LayoutRect (NSTextBlock block, int glyphIndex, NSRangePointer effectiveGlyphRange); //[Export ("boundsRectForTextBlock:atIndex:effectiveRange:")] - //RectangleF BoundsRect (NSTextBlock block, int glyphIndex, NSRangePointer effectiveGlyphRange); + //NSRect BoundsRect (NSTextBlock block, int glyphIndex, NSRangePointer effectiveGlyphRange); //[Export ("glyphRangeForCharacterRange:actualCharacterRange:")] //NSRange GetGlyphRange (NSRange charRange, NSRangePointer actualCharRange); @@ -7348,7 +7426,7 @@ public partial interface NSLayoutManager { NSRange GetGlyphRange (NSTextContainer container); [Export ("rangeOfNominallySpacedGlyphsContainingIndex:")] - NSRange RangeOfNominallySpacedGlyphsContainingIndex (int glyphIndex); + NSRange RangeOfNominallySpacedGlyphsContainingIndex (NSInteger glyphIndex); //[Export ("rectArrayForCharacterRange:withinSelectedCharacterRange:inTextContainer:rectCount:")] //NSRectArray RectArrayForCharacterRangewithinSelectedCharacterRangeinTextContainerrectCount (NSRange charRange, NSRange selCharRange, NSTextContainer container, uint rectCount); @@ -7357,28 +7435,28 @@ public partial interface NSLayoutManager { //NSRectArray RectArrayForGlyphRangewithinSelectedGlyphRangeinTextContainerrectCount (NSRange glyphRange, NSRange selGlyphRange, NSTextContainer container, uint rectCount); [Export ("boundingRectForGlyphRange:inTextContainer:")] - RectangleF BoundingRectForGlyphRange (NSRange glyphRange, NSTextContainer container); + NSRect BoundingRectForGlyphRange (NSRange glyphRange, NSTextContainer container); [Export ("glyphRangeForBoundingRect:inTextContainer:")] - NSRange GlyphRangeForBoundingRect (RectangleF bounds, NSTextContainer container); + NSRange GlyphRangeForBoundingRect (NSRect bounds, NSTextContainer container); [Export ("glyphRangeForBoundingRectWithoutAdditionalLayout:inTextContainer:")] - NSRange GlyphRangeForBoundingRectWithoutAdditionalLayout (RectangleF bounds, NSTextContainer container); + NSRange GlyphRangeForBoundingRectWithoutAdditionalLayout (NSRect bounds, NSTextContainer container); [Export ("glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:")] - uint GlyphIndexForPointInTextContainer (PointF point, NSTextContainer container, ref float fractionOfDistanceThroughGlyph); + NSUInteger GlyphIndexForPointInTextContainer (NSPoint point, NSTextContainer container, ref CGFloat fractionOfDistanceThroughGlyph); [Export ("glyphIndexForPoint:inTextContainer:")] - uint GlyphIndexForPoint (PointF point, NSTextContainer container); + NSUInteger GlyphIndexForPoint (NSPoint point, NSTextContainer container); [Export ("fractionOfDistanceThroughGlyphForPoint:inTextContainer:")] - float FractionOfDistanceThroughGlyphForPoint (PointF point, NSTextContainer container); + CGFloat FractionOfDistanceThroughGlyphForPoint (NSPoint point, NSTextContainer container); [Export ("characterIndexForPoint:inTextContainer:fractionOfDistanceBetweenInsertionPoints:")] - uint CharacterIndexForPoint (PointF point, NSTextContainer container, ref float fractionOfDistanceBetweenInsertionPoints); + NSUInteger CharacterIndexForPoint (NSPoint point, NSTextContainer container, ref CGFloat fractionOfDistanceBetweenInsertionPoints); [Export ("getLineFragmentInsertionPointsForCharacterAtIndex:alternatePositions:inDisplayOrder:positions:characterIndexes:")] - uint GetLineFragmentInsertionPoints (uint charIndex, bool aFlag, bool dFlag, IntPtr positions, IntPtr charIndexes); + NSUInteger GetLineFragmentInsertionPoints (NSUInteger charIndex, bool aFlag, bool dFlag, IntPtr positions, IntPtr charIndexes); //[Export ("temporaryAttributesAtCharacterIndex:effectiveRange:")] //NSDictionary GetTemporaryAttributes (int charIndex, NSRangePointer effectiveCharRange); @@ -7408,10 +7486,10 @@ public partial interface NSLayoutManager { NSFont SubstituteFontForFont (NSFont originalFont); [Export ("defaultLineHeightForFont:")] - float DefaultLineHeightForFont (NSFont theFont); + CGFloat DefaultLineHeightForFont (NSFont theFont); [Export ("defaultBaselineOffsetForFont:")] - float DefaultBaselineOffsetForFont (NSFont theFont); + CGFloat DefaultBaselineOffsetForFont (NSFont theFont); //Detected properties [Export ("textStorage")] @@ -7467,7 +7545,7 @@ public interface NSLayoutManagerDelegate { void LayoutCompleted (NSLayoutManager layoutManager, NSTextContainer textContainer, bool layoutFinishedFlag); [Export ("layoutManager:shouldUseTemporaryAttributes:forDrawingToScreen:atCharacterIndex:effectiveRange:")] - NSDictionary ShouldUseTemporaryAttributes (NSLayoutManager layoutManager, NSDictionary temporaryAttributes, bool drawingToScreen, int charIndex, IntPtr effectiveCharRange); + NSDictionary ShouldUseTemporaryAttributes (NSLayoutManager layoutManager, NSDictionary temporaryAttributes, bool drawingToScreen, NSInteger charIndex, IntPtr effectiveCharRange); } @@ -7493,7 +7571,7 @@ public interface NSMatrixDelegate { 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, int index); + string [] GetCompletions (NSControl control, NSTextView textView, string [] words, NSRange charRange, NSInteger index); } [BaseType (typeof (NSObject))] @@ -7515,10 +7593,10 @@ public interface NSPageLayout { void BeginSheet (NSPrintInfo printInfo, NSWindow docWindow, [NullAllowed] NSObject del, [NullAllowed] Selector didEndSelector, IntPtr contextInfo); [Export ("runModalWithPrintInfo:")] - int RunModalWithPrintInfo (NSPrintInfo printInfo); + NSInteger RunModalWithPrintInfo (NSPrintInfo printInfo); [Export ("runModal")] - int RunModal (); + NSInteger RunModal (); [Export ("printInfo")] NSPrintInfo PrintInfo { get; } @@ -7549,31 +7627,31 @@ public interface NSParagraphStyle { NSWritingDirection DefaultWritingDirection (string languageName); [Export ("lineSpacing")] - float LineSpacing { get; [NotImplemented] set; } + CGFloat LineSpacing { get; [NotImplemented] set; } [Export ("paragraphSpacing")] - float ParagraphSpacing { get; [NotImplemented] set; } + CGFloat ParagraphSpacing { get; [NotImplemented] set; } [Export ("alignment")] NSTextAlignment Alignment { get; [NotImplemented] set; } [Export ("headIndent")] - float HeadIndent { get; [NotImplemented] set; } + CGFloat HeadIndent { get; [NotImplemented] set; } [Export ("tailIndent")] - float TailIndent { get; [NotImplemented] set; } + CGFloat TailIndent { get; [NotImplemented] set; } [Export ("firstLineHeadIndent")] - float FirstLineHeadIndent { get; [NotImplemented] set; } + CGFloat FirstLineHeadIndent { get; [NotImplemented] set; } [Export ("tabStops")] NSTextTab [] TabStops { get; [NotImplemented] set; } [Export ("minimumLineHeight")] - float MinimumLineHeight { get; [NotImplemented] set; } + CGFloat MinimumLineHeight { get; [NotImplemented] set; } [Export ("maximumLineHeight")] - float MaximumLineHeight { get; [NotImplemented] set; } + CGFloat MaximumLineHeight { get; [NotImplemented] set; } [Export ("lineBreakMode")] NSLineBreakMode LineBreakMode { get; [NotImplemented] set; } @@ -7582,13 +7660,13 @@ public interface NSParagraphStyle { NSWritingDirection BaseWritingDirection { get; [NotImplemented] set; } [Export ("lineHeightMultiple")] - float LineHeightMultiple { get; [NotImplemented] set; } + CGFloat LineHeightMultiple { get; [NotImplemented] set; } [Export ("paragraphSpacingBefore")] - float ParagraphSpacingBefore { get; [NotImplemented] set; } + CGFloat ParagraphSpacingBefore { get; [NotImplemented] set; } [Export ("defaultTabInterval")] - float DefaultTabInterval { get; [NotImplemented] set; } + CGFloat DefaultTabInterval { get; [NotImplemented] set; } [Export ("textBlocks")] NSTextTableBlock [] TextBlocks { get; [NotImplemented] set; } @@ -7603,7 +7681,7 @@ public interface NSParagraphStyle { float TighteningFactorForTruncation { get; [NotImplemented] set; } [Export ("headerLevel")] - int HeaderLevel { get; [NotImplemented] set; } + NSInteger HeaderLevel { get; [NotImplemented] set; } } [BaseType (typeof (NSParagraphStyle))] @@ -7624,7 +7702,7 @@ public interface NSMutableParagraphStyle { [Export ("defaultTabInterval")] [Override] - float DefaultTabInterval { get; set; } + CGFloat DefaultTabInterval { get; set; } [Export ("setTextBlocks:")] void SetTextBlocks (NSTextBlock [] array); @@ -7638,11 +7716,11 @@ public interface NSMutableParagraphStyle { [Export ("headerLevel")] [Override] - int HeaderLevel { get; set; } + NSInteger HeaderLevel { get; set; } [Export ("lineSpacing")] [Override] - float LineSpacing { get; set; } + CGFloat LineSpacing { get; set; } [Export ("alignment")] [Override] @@ -7650,23 +7728,23 @@ public interface NSMutableParagraphStyle { [Export ("headIndent")] [Override] - float HeadIndent { get; set; } + CGFloat HeadIndent { get; set; } [Export ("tailIndent")] [Override] - float TailIndent { get; set; } + CGFloat TailIndent { get; set; } [Export ("firstLineHeadIndent")] [Override] - float FirstLineHeadIndent { get; set; } + CGFloat FirstLineHeadIndent { get; set; } [Export ("minimumLineHeight")] [Override] - float MinimumLineHeight { get; set; } + CGFloat MinimumLineHeight { get; set; } [Export ("maximumLineHeight")] [Override] - float MaximumLineHeight { get; set; } + CGFloat MaximumLineHeight { get; set; } [Export ("lineBreakMode")] [Override] @@ -7678,15 +7756,15 @@ public interface NSMutableParagraphStyle { [Export ("lineHeightMultiple")] [Override] - float LineHeightMultiple { get; set; } + CGFloat LineHeightMultiple { get; set; } [Export ("paragraphSpacing")] [Override] - float ParagraphSpacing { get; set; } + CGFloat ParagraphSpacing { get; set; } [Export ("paragraphSpacingBefore")] [Override] - float ParagraphSpacingBefore { get; set; } + CGFloat ParagraphSpacingBefore { get; set; } [Export ("hyphenationFactor")] [Override] @@ -7712,13 +7790,13 @@ public partial interface NSPasteboard { string Name { get; } [Export ("changeCount")] - int ChangeCount { get; } + NSInteger ChangeCount { get; } [Export ("releaseGlobally")] void ReleaseGlobally (); [Export ("clearContents")] - int ClearContents (); + NSInteger ClearContents (); [Export ("writeObjects:")] bool WriteObjects (NSPasteboardReading [] objects); @@ -7730,7 +7808,7 @@ public partial interface NSPasteboard { NSPasteboardItem [] PasteboardItems { get; } [Export ("indexOfPasteboardItem:")] - int IndexOf (NSPasteboardItem pasteboardItem); + NSUInteger IndexOf (NSPasteboardItem pasteboardItem); [Export ("canReadItemWithDataConformingToTypes:")] bool CanReadItemWithDataConformingToTypes (string [] utiTypes); @@ -7739,10 +7817,10 @@ public partial interface NSPasteboard { bool CanReadObjectForClasses (NSObject [] classArray, NSDictionary options); [Export ("declareTypes:owner:")] - int DeclareTypes (string [] newTypes, [NullAllowed] NSObject newOwner); + NSInteger DeclareTypes (string [] newTypes, [NullAllowed] NSObject newOwner); [Export ("addTypes:owner:")] - int AddTypes (string [] newTypes, [NullAllowed] NSObject newOwner); + NSInteger AddTypes (string [] newTypes, [NullAllowed] NSObject newOwner); [Export ("types")] string [] Types { get; } @@ -7946,19 +8024,19 @@ public interface NSPathCell { NSPathComponentCell [] PathComponentCells { get; set; } [Export ("rectOfPathComponentCell:withFrame:inView:")] - RectangleF GetRect (NSPathComponentCell componentCell, RectangleF withFrame, NSView inView); + NSRect GetRect (NSPathComponentCell componentCell, NSRect withFrame, NSView inView); [Export ("pathComponentCellAtPoint:withFrame:inView:")] - NSPathComponentCell GetPathComponent (PointF point, RectangleF frame, NSView view); + NSPathComponentCell GetPathComponent (NSPoint point, NSRect frame, NSView view); [Export ("clickedPathComponentCell")] NSPathComponentCell ClickedPathComponentCell { get; } [Export ("mouseEntered:withFrame:inView:")] - void MouseEntered (NSEvent evt, RectangleF frame, NSView view); + void MouseEntered (NSEvent evt, NSRect frame, NSView view); [Export ("mouseExited:withFrame:inView:")] - void MouseExited (NSEvent evt, RectangleF frame, NSView view); + void MouseExited (NSEvent evt, NSRect frame, NSView view); [Export ("doubleAction")] Selector DoubleAction { get; set; } @@ -7999,7 +8077,7 @@ public interface NSPathComponentCell { [BaseType (typeof (NSControl))] public interface NSPathControl { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("URL")] NSUrl Url { get; set; } @@ -8070,13 +8148,13 @@ interface NSPopover { NSViewController ContentViewController { get; set; } [Export ("contentSize")] - SizeF ContentSize { get; set; } + NSSize ContentSize { get; set; } [Export ("shown")] bool Shown { [Bind ("isShown")] get; } [Export ("positioningRect")] - RectangleF PositioningRect { get; set; } + NSRect PositioningRect { get; set; } [Export ("delegate"), NullAllowed] NSObject WeakDelegate { get; set; } @@ -8085,7 +8163,7 @@ interface NSPopover { NSPopoverDelegate Delegate { set; get; } [Export ("showRelativeToRect:ofView:preferredEdge:")] - void Show (RectangleF relativePositioningRect, NSView positioningView, NSRectEdge preferredEdge); + void Show (NSRect relativePositioningRect, NSView positioningView, NSRectEdge preferredEdge); [Export ("performClose:")] void PerformClose (NSObject sender); @@ -8140,7 +8218,7 @@ interface NSPopoverDelegate { [BaseType (typeof (NSButton))] public interface NSPopUpButton { [Export ("initWithFrame:pullsDown:")] - IntPtr Constructor (RectangleF buttonFrame, bool pullsDown); + IntPtr Constructor (NSRect buttonFrame, bool pullsDown); [Export ("addItemWithTitle:")] void AddItem (string title); @@ -8149,13 +8227,13 @@ public interface NSPopUpButton { void AddItems (string [] itemTitles); [Export ("insertItemWithTitle:atIndex:")] - void InsertItem (string title, int index); + void InsertItem (string title, NSInteger index); [Export ("removeItemWithTitle:")] void RemoveItem (string title); [Export ("removeItemAtIndex:")] - void RemoveItem (int index); + void RemoveItem (NSInteger index); [Export ("removeAllItems")] void RemoveAllItems (); @@ -8164,25 +8242,25 @@ public interface NSPopUpButton { NSMenuItem [] Items (); [Export ("numberOfItems")] - int ItemCount { get; } + NSInteger ItemCount { get; } [Export ("indexOfItem:")] - int IndexOfItem (NSMenuItem item); + NSInteger IndexOfItem (NSMenuItem item); [Export ("indexOfItemWithTitle:")] - int IndexOfItem (string title); + NSInteger IndexOfItem (string title); [Export ("indexOfItemWithTag:")] - int IndexOfItem (int tag); + NSInteger IndexOfItem (NSInteger tag); [Export ("indexOfItemWithRepresentedObject:")] - int IndexOfItem (NSObject obj); + NSInteger IndexOfItem (NSObject obj); [Export ("indexOfItemWithTarget:andAction:")] - int IndexOfItem (NSObject target, Selector actionSelector); + NSInteger IndexOfItem (NSObject target, Selector actionSelector); [Export ("itemAtIndex:")] - NSMenuItem ItemAtIndex (int index); + NSMenuItem ItemAtIndex (NSInteger index); [Export ("itemWithTitle:")] NSMenuItem ItemWithTitle (string title); @@ -8194,13 +8272,13 @@ public interface NSPopUpButton { void SelectItem ([NullAllowed] NSMenuItem item); [Export ("selectItemAtIndex:")] - void SelectItem (int index); + void SelectItem (NSInteger index); [Export ("selectItemWithTitle:")] void SelectItem (string title); [Export ("selectItemWithTag:")] - bool SelectItemWithTag (int tag); + bool SelectItemWithTag (NSInteger tag); [Export ("setTitle:")] void SetTitle (string aString); @@ -8209,13 +8287,13 @@ public interface NSPopUpButton { NSMenuItem SelectedItem { get; } [Export ("indexOfSelectedItem")] - int IndexOfSelectedItem { get; } + NSInteger IndexOfSelectedItem { get; } [Export ("synchronizeTitleAndSelectedItem")] void SynchronizeTitleAndSelectedItem (); [Export ("itemTitleAtIndex:")] - string ItemTitle (int index); + string ItemTitle (NSInteger index); [Export ("itemTitles")] string [] ItemTitles (); @@ -8257,13 +8335,13 @@ public interface NSPopUpButtonCell { void AddItems (string [] itemTitles); [Export ("insertItemWithTitle:atIndex:")] - void InsertItem (string title, int index); + void InsertItem (string title, NSInteger index); [Export ("removeItemWithTitle:")] void RemoveItem (string title); [Export ("removeItemAtIndex:")] - void RemoveItemAt (int index); + void RemoveItemAt (NSInteger index); [Export ("removeAllItems")] void RemoveAllItems (); @@ -8272,25 +8350,25 @@ public interface NSPopUpButtonCell { NSMenuItem [] Items { get; } [Export ("numberOfItems")] - int Count { get; } + NSInteger Count { get; } [Export ("indexOfItem:")] - int IndexOf (NSMenuItem item); + NSInteger IndexOf (NSMenuItem item); [Export ("indexOfItemWithTitle:")] - int IndexOfItemWithTitle (string title); + NSInteger IndexOfItemWithTitle (string title); [Export ("indexOfItemWithTag:")] - int IndexOfItemWithTag (int tag); + NSInteger IndexOfItemWithTag (NSInteger tag); [Export ("indexOfItemWithRepresentedObject:")] - int IndexOfItemWithRepresentedObject (NSObject obj); + NSInteger IndexOfItemWithRepresentedObject (NSObject obj); [Export ("indexOfItemWithTarget:andAction:")] - int IndexOfItemWithTargetandAction (NSObject target, Selector actionSelector); + NSInteger IndexOfItemWithTargetandAction (NSObject target, Selector actionSelector); [Export ("itemAtIndex:")] - NSMenuItem ItemAt (int index); + NSMenuItem ItemAt (NSInteger index); [Export ("itemWithTitle:")] NSMenuItem ItemWithTitle (string title); @@ -8302,13 +8380,13 @@ public interface NSPopUpButtonCell { void SelectItem (NSMenuItem item); [Export ("selectItemAtIndex:")] - void SelectItemAt (int index); + void SelectItemAt (NSInteger index); [Export ("selectItemWithTitle:")] void SelectItemWithTitle (string title); [Export ("selectItemWithTag:")] - bool SelectItemWithTag (int tag); + bool SelectItemWithTag (NSInteger tag); [Export ("setTitle:")] void SetTitle (string aString); @@ -8317,7 +8395,7 @@ public interface NSPopUpButtonCell { NSMenuItem SelectedItem { get; } [Export ("indexOfSelectedItem")] - int SelectedItemIndex { get; } + NSInteger SelectedItemIndex { get; } [Export ("synchronizeTitleAndSelectedItem")] void SynchronizeTitleAndSelectedItem (); @@ -8332,13 +8410,13 @@ public interface NSPopUpButtonCell { string TitleOfSelectedItem { get; } [Export ("attachPopUpWithFrame:inView:")] - void AttachPopUp (RectangleF cellFrame, NSView inView); + void AttachPopUp (NSRect cellFrame, NSView inView); [Export ("dismissPopUp")] void DismissPopUp (); [Export ("performClickWithFrame:inView:")] - void PerformClick (RectangleF withFrame, NSView controlView); + void PerformClick (NSRect withFrame, NSView controlView); //Detected properties [Export ("menu")] @@ -8392,10 +8470,10 @@ public interface NSPrinter { string Type { get; } [Export ("languageLevel")] - int LanguageLevel { get; } + NSInteger LanguageLevel { get; } - [Export ("pageSizeForPaper:")] - SizeF PageSizeForPaper (string paperName); + [Export ("pageNSSizeorPaper:")] + NSSize PageNSSizeorPaper (string paperName); [Export ("statusForTable:")] NSPrinterTableStatus StatusForTable (string tableName); @@ -8413,10 +8491,10 @@ public interface NSPrinter { int IntForKey (string key, string table); [Export ("rectForKey:inTable:")] - RectangleF RectForKey (string key, string table); + NSRect RectForKey (string key, string table); [Export ("sizeForKey:inTable:")] - SizeF SizeForKey (string key, string table); + NSSize NSSizeorKey (string key, string table); [Export ("stringForKey:inTable:")] string StringForKey (string key, string table); @@ -8440,7 +8518,7 @@ public interface NSPrintInfo { void SetUpPrintOperationDefaultValues (); [Export ("imageablePageBounds")] - RectangleF ImageablePageBounds { get; } + NSRect ImageablePageBounds { get; } [Export ("localizedPaperName")] string LocalizedPaperName { get; } @@ -8476,25 +8554,25 @@ public interface NSPrintInfo { string PaperName { get; set; } [Export ("paperSize")] - SizeF PaperSize { get; set; } + NSSize PaperSize { get; set; } [Export ("orientation")] NSPrintingOrientation Orientation { get; set; } [Export ("scalingFactor")] - float ScalingFactor { get; set; } + CGFloat ScalingFactor { get; set; } [Export ("leftMargin")] - float LeftMargin { get; set; } + CGFloat LeftMargin { get; set; } [Export ("rightMargin")] - float RightMargin { get; set; } + CGFloat RightMargin { get; set; } [Export ("topMargin")] - float TopMargin { get; set; } + CGFloat TopMargin { get; set; } [Export ("bottomMargin")] - float BottomMargin { get; set; } + CGFloat BottomMargin { get; set; } [Export ("horizontallyCentered")] bool HorizontallyCentered { [Bind ("isHorizontallyCentered")]get; set; } @@ -8528,19 +8606,19 @@ public partial interface NSPrintOperation { [Static] [Export ("PDFOperationWithView:insideRect:toData:printInfo:")] - NSPrintOperation PdfFromView (NSView view, RectangleF rect, NSMutableData data, NSPrintInfo printInfo); + NSPrintOperation PdfFromView (NSView view, NSRect rect, NSMutableData data, NSPrintInfo printInfo); [Static] [Export ("PDFOperationWithView:insideRect:toPath:printInfo:")] - NSPrintOperation PdfFromView (NSView view, RectangleF rect, string path, NSPrintInfo printInfo); + NSPrintOperation PdfFromView (NSView view, NSRect rect, string path, NSPrintInfo printInfo); [Static] [Export ("EPSOperationWithView:insideRect:toData:printInfo:")] - NSPrintOperation EpsFromView (NSView view, RectangleF rect, NSMutableData data, NSPrintInfo printInfo); + NSPrintOperation EpsFromView (NSView view, NSRect rect, NSMutableData data, NSPrintInfo printInfo); [Static] [Export ("EPSOperationWithView:insideRect:toPath:printInfo:")] - NSPrintOperation EpsFromView (NSView view, RectangleF rect, string path, NSPrintInfo printInfo); + NSPrintOperation EpsFromView (NSView view, NSRect rect, string path, NSPrintInfo printInfo); [Static] [Export ("printOperationWithView:")] @@ -8548,11 +8626,11 @@ public partial interface NSPrintOperation { [Static] [Export ("PDFOperationWithView:insideRect:toData:")] - NSPrintOperation PdfFromView (NSView view, RectangleF rect, NSMutableData data); + NSPrintOperation PdfFromView (NSView view, NSRect rect, NSMutableData data); [Static] [Export ("EPSOperationWithView:insideRect:toData:")] - NSPrintOperation EpsFromView (NSView view, RectangleF rect, NSMutableData data); + NSPrintOperation EpsFromView (NSView view, NSRect rect, NSMutableData data); [Export ("isCopyingOperation")] bool IsCopyingOperation { get; } @@ -8573,7 +8651,7 @@ public partial interface NSPrintOperation { NSRange PageRange { get; } [Export ("currentPage")] - int CurrentPage { get; } + NSInteger CurrentPage { get; } [Export ("createContext")] NSGraphicsContext CreateContext (); @@ -8645,10 +8723,10 @@ public interface NSPrintPanel { void BeginSheet (NSPrintInfo printInfo, NSWindow docWindow, [NullAllowed] NSObject del, [NullAllowed] Selector didEndSelector, IntPtr contextInfo); [Export ("runModalWithPrintInfo:")] - int RunModalWithPrintInfo (NSPrintInfo printInfo); + NSInteger RunModalWithPrintInfo (NSPrintInfo printInfo); [Export ("runModal")] - int RunModal (); + NSInteger RunModal (); [Export ("printInfo")] NSPrintInfo PrintInfo { get; } @@ -8670,7 +8748,7 @@ public interface NSPrintPanel { [BaseType (typeof (NSView))] public interface NSProgressIndicator { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("incrementBy:")] void IncrementBy (double delta); @@ -8867,7 +8945,7 @@ public partial interface NSResponder { [BaseType (typeof (NSObject))] public interface NSRulerMarker { [Export ("initWithRulerView:markerLocation:image:imageOrigin:")] - IntPtr Constructor (NSRulerView ruler, float location, NSImage image, PointF imageOrigin); + IntPtr Constructor (NSRulerView ruler, CGFloat location, NSImage image, NSPoint imageOrigin); [Export ("ruler")] NSRulerView Ruler { get; } @@ -8876,26 +8954,26 @@ public interface NSRulerMarker { bool IsDragging { get; } [Export ("imageRectInRuler")] - RectangleF ImageRectInRuler { get; } + NSRect ImageRectInRuler { get; } [Export ("thicknessRequiredInRuler")] - float ThicknessRequiredInRuler { get; } + CGFloat ThicknessRequiredInRuler { get; } [Export ("drawRect:")] - void DrawRect (RectangleF rect); + void DrawRect (NSRect rect); [Export ("trackMouse:adding:")] bool TrackMouse (NSEvent mouseDownEvent, bool isAdding); //Detected properties [Export ("markerLocation")] - float MarkerLocation { get; set; } + CGFloat MarkerLocation { get; set; } [Export ("image")] NSImage Image { get; set; } [Export ("imageOrigin")] - PointF ImageOrigin { get; set; } + NSPoint ImageOrigin { get; set; } [Export ("movable")] bool Movable { [Bind ("isMovable")]get; set; } @@ -8910,20 +8988,20 @@ public interface NSRulerMarker { [BaseType (typeof (NSView))] public partial interface NSRulerView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Static] [Export ("registerUnitWithName:abbreviation:unitToPointsConversionFactor:stepUpCycle:stepDownCycle:")] - void RegisterUnit (string unitName, string abbreviation, float conversionFactor, NSNumber [] stepUpCycle, NSNumber [] stepDownCycle); + void RegisterUnit (string unitName, string abbreviation, CGFloat conversionFactor, NSNumber [] stepUpCycle, NSNumber [] stepDownCycle); [Export ("initWithScrollView:orientation:")] IntPtr Constructor (NSScrollView scrollView, NSRulerOrientation orientation); [Export ("baselineLocation")] - float BaselineLocation { get; } + CGFloat BaselineLocation { get; } [Export ("requiredThickness")] - float RequiredThickness { get; } + CGFloat RequiredThickness { get; } [Export ("addMarker:")] void AddMarker (NSRulerMarker marker); @@ -8935,16 +9013,16 @@ public partial interface NSRulerView { bool TrackMarker (NSRulerMarker marker, NSEvent theEvent); [Export ("moveRulerlineFromLocation:toLocation:")] - void MoveRulerline (float oldLocation, float newLocation); + void MoveRulerline (CGFloat oldLocation, CGFloat newLocation); [Export ("invalidateHashMarks")] void InvalidateHashMarks (); [Export ("drawHashMarksAndLabelsInRect:")] - void DrawHashMarksAndLabels (RectangleF rect); + void DrawHashMarksAndLabels (NSRect rect); [Export ("drawMarkersInRect:")] - void DrawMarkers (RectangleF rect); + void DrawMarkers (NSRect rect); [Export ("isFlipped")] bool IsFlipped { get; } @@ -8957,19 +9035,19 @@ public partial interface NSRulerView { NSRulerOrientation Orientation { get; set; } [Export ("ruleThickness")] - float RuleThickness { get; set; } + CGFloat RuleThickness { get; set; } [Export ("reservedThicknessForMarkers")] - float ReservedThicknessForMarkers { get; set; } + CGFloat ReservedThicknessForMarkers { get; set; } [Export ("reservedThicknessForAccessoryView")] - float ReservedThicknessForAccessoryView { get; set; } + CGFloat ReservedThicknessForAccessoryView { get; set; } [Export ("measurementUnits")] string MeasurementUnits { get; set; } [Export ("originOffset")] - float OriginOffset { get; set; } + CGFloat OriginOffset { get; set; } [Export ("clientView")] NSView ClientView { get; set; } @@ -9011,7 +9089,7 @@ public interface NSSavePanel { void Begin (NSSavePanelComplete onComplete); [Export ("runModal")] - int RunModal (); + NSInteger RunModal (); //Detected properties [Export ("directoryURL")] @@ -9080,7 +9158,7 @@ public interface NSSavePanel { [Obsolete ("On 10.6 and newer use RunModal without parameters instead")] [Export ("runModalForDirectory:file:")] - int RunModal ([NullAllowed] string directory, [NullAllowed] string filename); + NSInteger RunModal ([NullAllowed] string directory, [NullAllowed] string filename); } [BaseType (typeof (NSSavePanel))] @@ -9105,10 +9183,10 @@ public interface NSScreen { NSWindowDepth Depth { get; } [Export ("frame")] - RectangleF Frame { get; } + NSRect Frame { get; } [Export ("visibleFrame")] - RectangleF VisibleFrame { get; } + NSRect VisibleFrame { get; } [Export ("deviceDescription")] NSDictionary DeviceDescription { get; } @@ -9120,40 +9198,40 @@ public interface NSScreen { IntPtr GetSupportedWindowDepths (); [Export ("userSpaceScaleFactor"), Obsolete ("On Lion")] - float UserSpaceScaleFactor { get; } + CGFloat UserSpaceScaleFactor { get; } [Lion, Export ("convertRectToBacking:")] - RectangleF ConvertRectToBacking (RectangleF aRect); + NSRect ConvertRectToBacking (NSRect aRect); [Lion, Export ("convertRectFromBacking:")] - RectangleF ConvertRectfromBacking (RectangleF aRect); + NSRect ConvertRectfromBacking (NSRect aRect); [Lion, Export ("backingAlignedRect:options:")] - RectangleF GetBackingAlignedRect (RectangleF globalScreenCoordRect, NSAlignmentOptions options); + NSRect GetBackingAlignedRect (NSRect globalScreenCoordRect, NSAlignmentOptions options); [Lion, Export ("backingScaleFactor")] - float BackingScaleFactor { get; } + CGFloat BackingScaleFactor { get; } } [BaseType (typeof (NSControl))] public interface NSScroller { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Static] [Export ("scrollerWidth")] - float ScrollerWidth { get; } + CGFloat ScrollerWidth { get; } [Static] [Export ("scrollerWidthForControlSize:")] - float ScrollerWidthForControlSize (NSControlSize controlSize); + CGFloat ScrollerWidthForControlSize (NSControlSize controlSize); [Export ("drawParts")] [Obsolete] void DrawParts (); [Export ("rectForPart:")] - RectangleF RectForPart (NSScrollerPart partCode); + NSRect RectForPart (NSScrollerPart partCode); [Export ("checkSpaceForParts")] void CheckSpaceForParts (); @@ -9168,13 +9246,13 @@ public interface NSScroller { void DrawKnob (); [Export ("drawKnobSlotInRect:highlight:")] - void DrawKnobSlot (RectangleF slotRect, bool highlight); + void DrawKnobSlot (NSRect slotRect, bool highlight); [Export ("highlight:")] void Highlight (bool flag); [Export ("testPart:")] - NSScrollerPart TestPart (PointF thePoint); + NSScrollerPart TestPart (NSPoint thePoint); [Export ("trackKnob:")] void TrackKnob (NSEvent theEvent); @@ -9196,7 +9274,7 @@ public interface NSScroller { NSControlSize ControlSize { get; set; } [Export ("knobProportion")] - float KnobProportion { get; set; } + CGFloat KnobProportion { get; set; } [Static] [Lion, Export ("isCompatibleWithOverlayScrollers")] @@ -9214,7 +9292,7 @@ public interface NSScroller { [Static] [Lion, Export ("scrollerWidthForControlSize:scrollerStyle:")] - float GetScrollerWidth (NSControlSize forControlSize, NSScrollerStyle scrollerStyle); + CGFloat GetScrollerWidth (NSControlSize forControlSize, NSScrollerStyle scrollerStyle); [Field ("NSPreferredScrollerStyleDidChangeNotification")] NSString NSPreferredScrollerStyleDidChangeNotification { get; } @@ -9224,21 +9302,21 @@ public interface NSScroller { [BaseType (typeof (NSView))] public partial interface NSScrollView : NSTextFinderBarContainer { [Static] - [Export ("frameSizeForContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:")] - SizeF FrameSizeForContentSize (SizeF cSize, bool hFlag, bool vFlag, NSBorderType aType); + [Export ("frameNSSizeorContentSize:hasHorizontalScroller:hasVerticalScroller:borderType:")] + NSSize FrameNSSizeorContentSize (NSSize cSize, bool hFlag, bool vFlag, NSBorderType aType); [Static] - [Export ("contentSizeForFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:")] - SizeF ContentSizeForFrame (SizeF fSize, bool hFlag, bool vFlag, NSBorderType aType); + [Export ("contentNSSizeorFrameSize:hasHorizontalScroller:hasVerticalScroller:borderType:")] + NSSize ContentNSSizeorFrame (NSSize fSize, bool hFlag, bool vFlag, NSBorderType aType); [Export ("documentVisibleRect")] - RectangleF DocumentVisibleRect { get; } + NSRect DocumentVisibleRect { get; } [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("contentSize")] - SizeF ContentSize { get; } + NSSize ContentSize { get; } [Export ("tile")] void Tile (); @@ -9284,22 +9362,22 @@ public partial interface NSScrollView : NSTextFinderBarContainer { bool AutohidesScrollers { get; set; } [Export ("horizontalLineScroll")] - float HorizontalLineScroll { get; set; } + CGFloat HorizontalLineScroll { get; set; } [Export ("verticalLineScroll")] - float VerticalLineScroll { get; set; } + CGFloat VerticalLineScroll { get; set; } [Export ("lineScroll")] - float LineScroll { get; set; } + CGFloat LineScroll { get; set; } [Export ("horizontalPageScroll")] - float HorizontalPageScroll { get; set; } + CGFloat HorizontalPageScroll { get; set; } [Export ("verticalPageScroll")] - float VerticalPageScroll { get; set; } + CGFloat VerticalPageScroll { get; set; } [Export ("pageScroll")] - float PageScroll { get; set; } + CGFloat PageScroll { get; set; } [Export ("scrollsDynamically")] bool ScrollsDynamically { get; set; } @@ -9320,8 +9398,8 @@ public partial interface NSScrollView : NSTextFinderBarContainer { NSRulerView VerticalRulerView { get; set; } [Static] - [Lion, Export ("contentSizeForFrameSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:")] - SizeF GetContentSizeForFrame (SizeF forFrameSize, Class horizontalScrollerClass, Class verticalScrollerClass, NSBorderType borderType, NSControlSize controlSize, NSScrollerStyle scrollerStyle); + [Lion, Export ("contentNSSizeorFrameSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:")] + NSSize GetContentNSSizeorFrame (NSSize forFrameSize, Class horizontalScrollerClass, Class verticalScrollerClass, NSBorderType borderType, NSControlSize controlSize, NSScrollerStyle scrollerStyle); [Lion, Export ("findBarPosition")] NSScrollViewFindBarPosition FindBarPosition { get; set; } @@ -9330,8 +9408,8 @@ public partial interface NSScrollView : NSTextFinderBarContainer { void FlashScrollers (); [Static] - [Lion, Export ("frameSizeForContentSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:")] - SizeF GetFrameSizeForContent (SizeF contentSize, Class horizontalScrollerClass, Class verticalScrollerClass, NSBorderType borderType, NSControlSize controlSize, NSScrollerStyle scrollerStyle); + [Lion, Export ("frameNSSizeorContentSize:horizontalScrollerClass:verticalScrollerClass:borderType:controlSize:scrollerStyle:")] + NSSize GetFrameNSSizeorContent (NSSize contentSize, Class horizontalScrollerClass, Class verticalScrollerClass, NSBorderType borderType, NSControlSize controlSize, NSScrollerStyle scrollerStyle); [Lion, Export ("horizontalScrollElasticity")] NSScrollElasticity HorizontalScrollElasticity { get; set; } @@ -9352,7 +9430,7 @@ public partial interface NSScrollView : NSTextFinderBarContainer { [BaseType (typeof (NSTextField))] public interface NSSearchField { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("recentSearches")] string [] RecentSearches { get; set; } @@ -9379,13 +9457,13 @@ public interface NSSearchFieldCell { void ResetCancelButtonCell (); [Export ("searchTextRectForBounds:")] - RectangleF SearchTextRectForBounds (RectangleF rect); + NSRect SearchTextRectForBounds (NSRect rect); [Export ("searchButtonRectForBounds:")] - RectangleF SearchButtonRectForBounds (RectangleF rect); + NSRect SearchButtonRectForBounds (NSRect rect); [Export ("cancelButtonRectForBounds:")] - RectangleF CancelButtonRectForBounds (RectangleF rect); + NSRect CancelButtonRectForBounds (NSRect rect); [Export ("searchMenuTemplate")] NSMenu SearchMenuTemplate { get; set; } @@ -9394,7 +9472,7 @@ public interface NSSearchFieldCell { bool SendsWholeSearchString { get; set; } [Export ("maximumRecents")] - int MaximumRecents { get; set; } + NSInteger MaximumRecents { get; set; } [Export ("recentSearches")] string [] RecentSearches { get; set; } @@ -9409,59 +9487,59 @@ public interface NSSearchFieldCell { [BaseType (typeof (NSControl))] public interface NSSegmentedControl { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("selectSegmentWithTag:")] - bool SelectSegment (int tag); + bool SelectSegment (NSInteger tag); [Export ("setWidth:forSegment:")] - void SetWidth (float width, int segment); + void SetWidth (CGFloat width, NSInteger segment); [Export ("widthForSegment:")] - float GetWidth (int segment); + CGFloat GetWidth (NSInteger segment); [Export ("setImage:forSegment:")] - void SetImage (NSImage image, int segment); + void SetImage (NSImage image, NSInteger segment); [Export ("imageForSegment:")] - NSImage GetImage (int segment); + NSImage GetImage (NSInteger segment); [Export ("setImageScaling:forSegment:")] - void SetImageScaling (NSImageScaling scaling, int segment); + void SetImageScaling (NSImageScaling scaling, NSInteger segment); [Export ("imageScalingForSegment:")] - NSImageScaling GetImageScaling (int segment); + NSImageScaling GetImageScaling (NSInteger segment); [Export ("setLabel:forSegment:")] - void SetLabel (string label, int segment); + void SetLabel (string label, NSInteger segment); [Export ("labelForSegment:")] - string GetLabel (int segment); + string GetLabel (NSInteger segment); [Export ("setMenu:forSegment:")] - void SetMenu (NSMenu menu, int segment); + void SetMenu (NSMenu menu, NSInteger segment); [Export ("menuForSegment:")] - NSMenu GetMenu (int segment); + NSMenu GetMenu (NSInteger segment); [Export ("setSelected:forSegment:")] - void SetSelected (bool selected, int segment); + void SetSelected (bool selected, NSInteger segment); [Export ("isSelectedForSegment:")] - bool IsSelectedForSegment (int segment); + bool IsSelectedForSegment (NSInteger segment); [Export ("setEnabled:forSegment:")] - void SetEnabled (bool enabled, int segment); + void SetEnabled (bool enabled, NSInteger segment); [Export ("isEnabledForSegment:")] - bool IsEnabled (int segment); + bool IsEnabled (NSInteger segment); //Detected properties [Export ("segmentCount")] - int SegmentCount { get; set; } + NSInteger SegmentCount { get; set; } [Export ("selectedSegment")] - int SelectedSegment { get; set; } + NSInteger SelectedSegment { get; set; } [Export ("segmentStyle")] NSSegmentStyle SegmentStyle { get; set; } @@ -9477,7 +9555,7 @@ public interface NSSegmentedCell { IntPtr Constructor (NSImage image); [Export ("selectSegmentWithTag:")] - bool SelectSegment (int tag); + bool SelectSegment (NSInteger tag); [Export ("makeNextSegmentKey")] void InsertSegmentAfterSelection (); @@ -9486,68 +9564,68 @@ public interface NSSegmentedCell { void InsertSegmentBeforeSelection (); [Export ("setWidth:forSegment:")] - void SetWidth (float width, int forSegment); + void SetWidth (CGFloat width, NSInteger forSegment); [Export ("widthForSegment:")] - float GetWidth (int forSegment); + CGFloat GetWidth (NSInteger forSegment); [Export ("setImage:forSegment:")] - void SetImage (NSImage image, int forSegment); + void SetImage (NSImage image, NSInteger forSegment); [Export ("imageForSegment:")] - NSImage GetImageForSegment (int forSegment); + NSImage GetImageForSegment (NSInteger forSegment); [Export ("setImageScaling:forSegment:")] - void SetImageScaling (NSImageScaling scaling, int forSegment); + void SetImageScaling (NSImageScaling scaling, NSInteger forSegment); [Export ("imageScalingForSegment:")] - NSImageScaling GetImageScaling (int forSegment); + NSImageScaling GetImageScaling (NSInteger forSegment); [Export ("setLabel:forSegment:")] - void SetLabel (string label, int forSegment); + void SetLabel (string label, NSInteger forSegment); [Export ("labelForSegment:")] - string GetLabel (int forSegment); + string GetLabel (NSInteger forSegment); [Export ("setSelected:forSegment:")] - void SetSelected (bool selected, int forSegment); + void SetSelected (bool selected, NSInteger forSegment); [Export ("isSelectedForSegment:")] - bool IsSelected (int forSegment); + bool IsSelected (NSInteger forSegment); [Export ("setEnabled:forSegment:")] - void SetEnabled (bool enabled, int forSegment); + void SetEnabled (bool enabled, NSInteger forSegment); [Export ("isEnabledForSegment:")] - bool IsEnabled (int forSegment); + bool IsEnabled (NSInteger forSegment); [Export ("setMenu:forSegment:")] - void SetMenu (NSMenu menu, int forSegment); + void SetMenu (NSMenu menu, NSInteger forSegment); [Export ("menuForSegment:")] - NSMenu GetMenu (int forSegment); + NSMenu GetMenu (NSInteger forSegment); [Export ("setToolTip:forSegment:")] - void SetToolTip (string toolTip, int forSegment); + void SetToolTip (string toolTip, NSInteger forSegment); [Export ("toolTipForSegment:")] - string GetToolTip (int forSegment); + string GetToolTip (NSInteger forSegment); [Export ("setTag:forSegment:")] - void SetTag (int tag, int forSegment); + void SetTag (NSInteger tag, NSInteger forSegment); [Export ("tagForSegment:")] - int GetTag (int forSegment); + NSInteger GetTag (NSInteger forSegment); [Export ("drawSegment:inFrame:withView:")] - void DrawSegment (int segment, RectangleF frame, NSView controlView); + void DrawSegment (NSInteger segment, NSRect frame, NSView controlView); //Detected properties [Export ("segmentCount")] - int SegmentCount { get; set; } + NSInteger SegmentCount { get; set; } [Export ("selectedSegment")] - int SelectedSegment { get; set; } + NSInteger SelectedSegment { get; set; } [Export ("trackingMode")] NSSegmentSwitchTracking TrackingMode { get; set; } @@ -9560,10 +9638,10 @@ public interface NSSegmentedCell { [BaseType (typeof (NSControl))] public interface NSSlider { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("isVertical")] - int IsVertical { get; } + NSInteger IsVertical { get; } [Export ("acceptsFirstMouse:")] bool AcceptsFirstMouse (NSEvent theEvent); @@ -9591,26 +9669,26 @@ public interface NSSlider { string Title { get; set; } [Export ("knobThickness")] - float KnobThickness { get; set; } + CGFloat KnobThickness { get; set; } [Export ("image")] NSImage Image { get; set; } [Export ("tickMarkValueAtIndex:")] - double TickMarkValue (int index); + double TickMarkValue (NSInteger index); [Export ("rectOfTickMarkAtIndex:")] - RectangleF RectOfTick (int index); + NSRect RectOfTick (NSInteger index); [Export ("indexOfTickMarkAtPoint:")] - int IndexOfTickMark (PointF point); + NSInteger IndexOfTickMark (NSPoint point); [Export ("closestTickMarkValueToValue:")] double ClosestTickMarkValue (double value); //Detected properties [Export ("numberOfTickMarks")] - int TickMarksCount { get; set; } + NSInteger TickMarksCount { get; set; } [Export ("tickMarkPosition")] NSTickMarkPosition TickMarkPosition { get; set; } @@ -9636,19 +9714,19 @@ public interface NSSliderCell { int IsVertical { get; } [Export ("knobRectFlipped:")] - RectangleF KnobRectFlipped (bool flipped); + NSRect KnobRectFlipped (bool flipped); [Export ("drawKnob:")] - void DrawKnob (RectangleF knobRect); + void DrawKnob (NSRect knobRect); [Export ("drawKnob")] void DrawKnob (); [Export ("drawBarInside:flipped:")] - void DrawBar (RectangleF aRect, bool flipped); + void DrawBar (NSRect aRect, bool flipped); [Export ("trackRect")] - RectangleF TrackRect{ get; } + NSRect TrackRect{ get; } //Detected properties [Export ("minValue")] @@ -9673,26 +9751,26 @@ public interface NSSliderCell { NSObject TitleCell { get; set; } [Export ("knobThickness")] - float KnobThickness { get; set; } + CGFloat KnobThickness { get; set; } [Export ("sliderType")] NSSliderType SliderType { get; set; } [Export ("tickMarkValueAtIndex:")] - double TickMarkValue (int index); + double TickMarkValue (NSInteger index); [Export ("rectOfTickMarkAtIndex:")] - RectangleF RectOfTickMark (int index); + NSRect RectOfTickMark (NSInteger index); [Export ("indexOfTickMarkAtPoint:")] - int IndexOfTickMark (PointF point); + NSInteger IndexOfTickMark (NSPoint point); [Export ("closestTickMarkValueToValue:")] double ClosestTickMarkValue (double value); //Detected properties [Export ("numberOfTickMarks")] - int TickMarks { get; set; } + NSInteger TickMarks { get; set; } [Export ("tickMarkPosition")] NSTickMarkPosition TickMarkPosition { get; set; } @@ -9845,29 +9923,29 @@ public partial interface NSSpellChecker { [Static] [Export ("uniqueSpellDocumentTag")] - int UniqueSpellDocumentTag { get; } + NSInteger UniqueSpellDocumentTag { get; } [Export ("checkSpellingOfString:startingAt:language:wrap:inSpellDocumentWithTag:wordCount:")] - NSRange CheckSpelling (string stringToCheck, int startingOffset, string language, bool wrapFlag, int documentTag, out int wordCount); + NSRange CheckSpelling (string stringToCheck, NSInteger startingOffset, string language, bool wrapFlag, NSInteger documentTag, out NSInteger wordCount); [Export ("checkSpellingOfString:startingAt:")] - NSRange CheckSpelling (string stringToCheck, int startingOffset); + NSRange CheckSpelling (string stringToCheck, NSInteger startingOffset); [Export ("countWordsInString:language:")] - int CountWords (string stringToCount, string language); + NSInteger CountWords (string stringToCount, string language); [Export ("checkGrammarOfString:startingAt:language:wrap:inSpellDocumentWithTag:details:")] - NSRange CheckGrammar (string stringToCheck, int startingOffset, string language, bool wrapFlag, int documentTag, NSDictionary[] details ); + NSRange CheckGrammar (string stringToCheck, int startingOffset, string language, bool wrapFlag, NSInteger documentTag, NSDictionary[] details ); [Export ("checkString:range:types:options:inSpellDocumentWithTag:orthography:wordCount:")] - NSTextCheckingResult [] CheckString (string stringToCheck, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, int tag, out NSOrthography orthography, out int wordCount); + NSTextCheckingResult [] CheckString (string stringToCheck, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, NSInteger tag, out NSOrthography orthography, out NSInteger wordCount); //FIXME: //[Export ("requestCheckingOfString:range:types:options:inSpellDocumentWithTag:completionHandler:NSIntegersequenceNumber,NSArray*results,NSOrthography*orthography,NSIntegerwordCount))completionHandler")] //int RequestChecking (string stringToCheck, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, int tag, IntPtr completionHandler ); [Export ("menuForResult:string:options:atLocation:inView:")] - NSMenu MenuForResults (NSTextCheckingResult result, string checkedString, NSDictionary options, PointF location, NSView view); + NSMenu MenuForResults (NSTextCheckingResult result, string checkedString, NSDictionary options, NSPoint location, NSView view); [Export ("userQuotesArrayForLanguage:")] string [] UserQuotesArrayForLanguage (string language); @@ -9891,22 +9969,22 @@ public partial interface NSSpellChecker { void UpdatePanels (); [Export ("ignoreWord:inSpellDocumentWithTag:")] - void IgnoreWord (string wordToIgnore, int documentTag); + void IgnoreWord (string wordToIgnore, NSInteger documentTag); [Export ("ignoredWordsInSpellDocumentWithTag:")] - string [] IgnoredWords (int documentTag); + string [] IgnoredWords (NSInteger documentTag); [Export ("setIgnoredWords:inSpellDocumentWithTag:")] - void SetIgnoredWords (string [] words, int documentTag); + void SetIgnoredWords (string [] words, NSInteger documentTag); [Export ("guessesForWordRange:inString:language:inSpellDocumentWithTag:")] - string [] GuessesForWordRange (NSRange range, string theString, string language, int documentTag); + string [] GuessesForWordRange (NSRange range, string theString, string language, NSInteger documentTag); [Export ("completionsForPartialWordRange:inString:language:inSpellDocumentWithTag:")] - string [] CompletionsForPartialWordRange (NSRange range, string theString, string language, int documentTag); + string [] CompletionsForPartialWordRange (NSRange range, string theString, string language, NSInteger documentTag); [Export ("closeSpellDocumentWithTag:")] - void CloseSpellDocument (int documentTag); + void CloseSpellDocument (NSInteger documentTag); [Export ("availableLanguages")] string [] AvailableLanguages { get; } @@ -10030,16 +10108,16 @@ public interface NSSoundDelegate { [BaseType (typeof (NSView))] public partial interface NSSplitView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("drawDividerInRect:")] - void DrawDivider (RectangleF rect); + void DrawDivider (NSRect rect); [Export ("dividerColor")] NSColor DividerColor { get; } [Export ("dividerThickness")] - float DividerThickness { get; } + CGFloat DividerThickness { get; } [Export ("adjustSubviews")] void AdjustSubviews (); @@ -10048,13 +10126,13 @@ public partial interface NSSplitView { bool IsSubviewCollapsed (NSView subview); [Export ("minPossiblePositionOfDividerAtIndex:")] - float MinPositionOfDivider (int dividerIndex); + CGFloat MinPositionOfDivider (NSInteger dividerIndex); [Export ("maxPossiblePositionOfDividerAtIndex:")] - float MaxPositionOfDivider (int dividerIndex); + CGFloat MaxPositionOfDivider (NSInteger dividerIndex); [Export ("setPosition:ofDividerAtIndex:")] - void SetPositionOfDivider (float position, int dividerIndex); + void SetPositionOfDivider (CGFloat position, NSInteger dividerIndex); //Detected properties [Export ("vertical")] @@ -10080,31 +10158,31 @@ public interface NSSplitViewDelegate { bool CanCollapse (NSSplitView splitView, NSView subview); [Export ("splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:")] [DefaultValue (true)] - bool ShouldCollapseForDoubleClick (NSSplitView splitView, NSView subview, int doubleClickAtDividerIndex); + bool ShouldCollapseForDoubleClick (NSSplitView splitView, NSView subview, NSInteger doubleClickAtDividerIndex); [Export ("splitView:constrainMinCoordinate:ofSubviewAt:")] - float SetMinCoordinateOfSubview (NSSplitView splitView, float proposedMinimumPosition, int subviewDividerIndex); + CGFloat SetMinCoordinateOfSubview (NSSplitView splitView, CGFloat proposedMinimumPosition, NSInteger subviewDividerIndex); [Export ("splitView:constrainMaxCoordinate:ofSubviewAt:")] - float SetMaxCoordinateOfSubview (NSSplitView splitView, float proposedMaximumPosition, int subviewDividerIndex); + CGFloat SetMaxCoordinateOfSubview (NSSplitView splitView, CGFloat proposedMaximumPosition, NSInteger subviewDividerIndex); [Export ("splitView:constrainSplitPosition:ofSubviewAt:")] - float ConstrainSplitPosition (NSSplitView splitView, float proposedPosition, int subviewDividerIndex); + CGFloat ConstrainSplitPosition (NSSplitView splitView, CGFloat proposedPosition, NSInteger subviewDividerIndex); [Export ("splitView:resizeSubviewsWithOldSize:")] - void Resize (NSSplitView splitView, SizeF oldSize); + void Resize (NSSplitView splitView, NSSize oldSize); [Export ("splitView:shouldAdjustSizeOfSubview:")][DefaultValue (true)] bool ShouldAdjustSize (NSSplitView splitView, NSView view); [Export ("splitView:shouldHideDividerAtIndex:")] [DefaultValue (false)] - bool ShouldHideDivider (NSSplitView splitView, int dividerIndex); + bool ShouldHideDivider (NSSplitView splitView, NSInteger dividerIndex); [Export ("splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:")] - RectangleF GetEffectiveRect (NSSplitView splitView, RectangleF proposedEffectiveRect, RectangleF drawnRect, int dividerIndex); + NSRect GetEffectiveRect (NSSplitView splitView, NSRect proposedEffectiveRect, NSRect drawnRect, NSInteger dividerIndex); [Export ("splitView:additionalEffectiveRectOfDividerAtIndex:")] - RectangleF GetAdditionalEffectiveRect (NSSplitView splitView, int dividerIndex); + NSRect GetAdditionalEffectiveRect (NSSplitView splitView, NSInteger dividerIndex); [Export ("splitViewWillResizeSubviews:")] void SplitViewWillResizeSubviews (NSNotification notification); @@ -10119,7 +10197,7 @@ public partial interface NSStatusBar { NSStatusBar SystemStatusBar { get; } [Export ("statusItemWithLength:")] - NSStatusItem CreateStatusItem (float length); + NSStatusItem CreateStatusItem (CGFloat length); [Export ("removeStatusItem:")] void RemoveStatusItem (NSStatusItem item); @@ -10128,7 +10206,7 @@ public partial interface NSStatusBar { bool IsVertical { get; } [Export ("thickness")] - float Thickness { get; } + CGFloat Thickness { get; } } [BaseType (typeof (NSObject))] @@ -10138,19 +10216,19 @@ public partial interface NSStatusItem { NSStatusBar StatusBar { get; } [Export ("length")] - float Length { get; set; } + CGFloat Length { get; set; } [Export ("action"), NullAllowed] Selector Action { get; set; } [Export ("sendActionOn:")] - int SendActionOn (NSTouchPhase mask); + NSInteger SendActionOn (NSTouchPhase mask); [Export ("popUpStatusItemMenu:")] void PopUpStatusItemMenu (NSMenu menu); [Export ("drawStatusBarBackgroundInRect:withHighlight:")] - void DrawStatusBarBackground (RectangleF rect, bool highlight); + void DrawStatusBarBackground (NSRect rect, bool highlight); //Detected properties [Export ("doubleAction")] @@ -10195,10 +10273,10 @@ public interface NSShadow { //Detected properties [Export ("shadowOffset")] - SizeF ShadowOffset { get; set; } + NSSize ShadowOffset { get; set; } [Export ("shadowBlurRadius")] - float ShadowBlurRadius { get; set; } + CGFloat ShadowBlurRadius { get; set; } [Export ("shadowColor")] NSColor ShadowColor { get; set; } @@ -10246,7 +10324,7 @@ partial interface NSTextFinderClient { [Abstract] [Export ("stringAtIndex:effectiveRange:endsWithSearchBoundary:")] - string StringAtIndexeffectiveRangeendsWithSearchBoundary (uint characterIndex, ref NSRange outRange, bool outFlag); + string StringAtIndexeffectiveRangeendsWithSearchBoundary (NSUInteger characterIndex, ref NSRange outRange, bool outFlag); [Abstract] [Export ("stringLength")] @@ -10270,7 +10348,7 @@ partial interface NSTextFinderClient { [Abstract] [Export ("contentViewAtIndex:effectiveCharacterRange:")] - NSView ContentViewAtIndexeffectiveCharacterRange (uint index, ref NSRange outRange); + NSView ContentViewAtIndexeffectiveCharacterRange (NSUInteger index, ref NSRange outRange); [Abstract] [Export ("rectsForCharacterRange:")] @@ -10324,16 +10402,17 @@ partial interface NSTextFinder { [Static] [Export ("drawIncrementalMatchHighlightInRect:")] - void DrawIncrementalMatchHighlightInRect (RectangleF rect); + void DrawIncrementalMatchHighlightInRect (NSRect rect); [Export ("noteClientStringWillChange")] void NoteClientStringWillChange (); } + //64 bit reviewed [BaseType (typeof (NSResponder))] public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyContainer, NSUserInterfaceItemIdentification { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("window")] NSWindow Window { get; } @@ -10357,7 +10436,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon // void GetRectsBeingDrawn [Export ("needsToDrawRect:")] - bool NeedsToDraw (RectangleF aRect); + bool NeedsToDraw (NSRect aRect); [Export ("wantsDefaultClipping")] bool WantsDefaultClipping { get; } @@ -10406,31 +10485,31 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void RemoveFromSuperviewWithoutNeedingDisplay (); [Export ("resizeSubviewsWithOldSize:")] - void ResizeSubviewsWithOldSize (SizeF oldSize); + void ResizeSubviewsWithOldSize (NSSize oldSize); [Export ("resizeWithOldSuperviewSize:")] - void ResizeWithOldSuperviewSize (SizeF oldSize); + void ResizeWithOldSuperviewSize (NSSize oldSize); [Export ("setFrameOrigin:")] - void SetFrameOrigin (PointF newOrigin); + void SetFrameOrigin (NSPoint newOrigin); [Export ("setFrameSize:")] - void SetFrameSize (SizeF newSize); + void SetFrameSize (NSSize newSize); [Export ("setBoundsOrigin:")] - void SetBoundsOrigin (PointF newOrigin); + void SetBoundsOrigin (NSPoint newOrigin); [Export ("setBoundsSize:")] - void SetBoundsSize (SizeF newSize); + void SetBoundsSize (NSSize newSize); [Export ("translateOriginToPoint:")] - void TranslateOriginToPoint (PointF translation); + void TranslateOriginToPoint (NSPoint translation); [Export ("scaleUnitSquareToSize:")] - void ScaleUnitSquareToSize (SizeF newUnitSize); + void ScaleUnitSquareToSize (NSSize newUnitSize); [Export ("rotateByAngle:")] - void RotateByAngle (float angle); + void RotateByAngle (CGFloat angle); [Export ("isFlipped")] bool IsFlipped { get; } @@ -10445,49 +10524,49 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool IsOpaque { get; } [Export ("convertPoint:fromView:")] - PointF ConvertPointFromView (PointF aPoint, [NullAllowed] NSView aView); + NSPoint ConvertPointFromView (NSPoint aPoint, [NullAllowed] NSView aView); [Export ("convertPoint:toView:")] - PointF ConvertPointToView (PointF aPoint, [NullAllowed] NSView aView); + NSPoint ConvertPointToView (NSPoint aPoint, [NullAllowed] NSView aView); [Export ("convertSize:fromView:")] - SizeF ConvertSizeFromView (SizeF aSize, [NullAllowed] NSView aView); + NSSize ConvertSizeFromView (NSSize aSize, [NullAllowed] NSView aView); [Export ("convertSize:toView:")] - SizeF ConvertSizeToView (SizeF aSize, [NullAllowed] NSView aView); + NSSize ConvertSizeToView (NSSize aSize, [NullAllowed] NSView aView); [Export ("convertRect:fromView:")] - RectangleF ConvertRectFromView (RectangleF aRect, [NullAllowed] NSView aView); + NSRect ConvertRectFromView (NSRect aRect, [NullAllowed] NSView aView); [Export ("convertRect:toView:")] - RectangleF ConvertRectToView (RectangleF aRect, [NullAllowed] NSView aView); + NSRect ConvertRectToView (NSRect aRect, [NullAllowed] NSView aView); [Export ("centerScanRect:")] - RectangleF CenterScanRect (RectangleF aRect); + NSRect CenterScanRect (NSRect aRect); [Export ("convertPointToBase:")] - PointF ConvertPointToBase (PointF aPoint); + NSPoint ConvertPointToBase (NSPoint aPoint); [Export ("convertPointFromBase:")] - PointF ConvertPointFromBase (PointF aPoint); + NSPoint ConvertPointFromBase (NSPoint aPoint); [Export ("convertSizeToBase:")] - SizeF ConvertSizeToBase (SizeF aSize); + NSSize ConvertSizeToBase (NSSize aSize); [Export ("convertSizeFromBase:")] - SizeF ConvertSizeFromBase (SizeF aSize); + NSSize ConvertSizeFromBase (NSSize aSize); [Export ("convertRectToBase:")] - RectangleF ConvertRectToBase (RectangleF aRect); + NSRect ConvertRectToBase (NSRect aRect); [Export ("convertRectFromBase:")] - RectangleF ConvertRectFromBase (RectangleF aRect); + NSRect ConvertRectFromBase (NSRect aRect); [Export ("canDraw")] bool CanDraw (); [Export ("setNeedsDisplayInRect:")] - void SetNeedsDisplayInRect (RectangleF invalidRect); + void SetNeedsDisplayInRect (NSRect invalidRect); //[Export ("setNeedsDisplay:")] //void SetNeedsDisplay (bool flag); @@ -10508,7 +10587,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon NSView FocusView (); [Export ("visibleRect")] - RectangleF VisibleRect (); + NSRect VisibleRect (); [Export ("display")] void Display (); @@ -10520,34 +10599,34 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void DisplayIfNeededIgnoringOpacity (); [Export ("displayRect:")] - void DisplayRect (RectangleF rect); + void DisplayRect (NSRect rect); [Export ("displayIfNeededInRect:")] - void DisplayIfNeededInRect (RectangleF rect); + void DisplayIfNeededInRect (NSRect rect); [Export ("displayRectIgnoringOpacity:")] - void DisplayRectIgnoringOpacity (RectangleF rect); + void DisplayRectIgnoringOpacity (NSRect rect); [Export ("displayIfNeededInRectIgnoringOpacity:")] - void DisplayIfNeededInRectIgnoringOpacity (RectangleF rect); + void DisplayIfNeededInRectIgnoringOpacity (NSRect rect); [Export ("drawRect:")] - void DrawRect (RectangleF dirtyRect); + void DrawRect (NSRect dirtyRect); [Export ("displayRectIgnoringOpacity:inContext:")] - void DisplayRectIgnoringOpacity (RectangleF aRect, NSGraphicsContext context); + void DisplayRectIgnoringOpacity (NSRect aRect, NSGraphicsContext context); [Export ("bitmapImageRepForCachingDisplayInRect:")] - NSBitmapImageRep BitmapImageRepForCachingDisplayInRect (RectangleF rect); + NSBitmapImageRep BitmapImageRepForCachingDisplayInRect (NSRect rect); [Export ("cacheDisplayInRect:toBitmapImageRep:")] - void CacheDisplay (RectangleF rect, NSBitmapImageRep bitmapImageRep); + void CacheDisplay (NSRect rect, NSBitmapImageRep bitmapImageRep); [Export ("viewWillDraw")] void ViewWillDraw (); [Export ("gState")] - int GState (); + NSInteger GState (); [Export ("allocateGState")] void AllocateGState (); @@ -10562,34 +10641,34 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void RenewGState (); [Export ("scrollPoint:")] - void ScrollPoint (PointF aPoint); + void ScrollPoint (NSPoint aPoint); [Export ("scrollRectToVisible:")] - bool ScrollRectToVisible (RectangleF aRect); + bool ScrollRectToVisible (NSRect aRect); [Export ("autoscroll:")] bool Autoscroll (NSEvent theEvent); [Export ("adjustScroll:")] - RectangleF AdjustScroll (RectangleF newVisible); + NSRect AdjustScroll (NSRect newVisible); [Export ("scrollRect:by:")] - void ScrollRect (RectangleF aRect, SizeF delta); + void ScrollRect (NSRect aRect, NSSize delta); [Export ("translateRectsNeedingDisplayInRect:by:")] - void TranslateRectsNeedingDisplay (RectangleF clipRect, SizeF delta); + void TranslateRectsNeedingDisplay (NSRect clipRect, NSSize delta); [Export ("hitTest:")] - NSView HitTest (PointF aPoint); + NSView HitTest (NSPoint aPoint); [Export ("mouse:inRect:")] - bool IsMouseInRect (PointF aPoint, RectangleF aRect); + bool IsMouseInRect (NSPoint aPoint, NSRect aRect); [Export ("viewWithTag:")] - NSObject ViewWithTag (int aTag); + NSObject ViewWithTag (NSInteger aTag); [Export ("tag")] - int Tag { get; } + NSInteger Tag { get; } [Export ("performKeyEquivalent:")] bool PerformKeyEquivalent (NSEvent theEvent); @@ -10607,10 +10686,10 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool MouseDownCanMoveWindow { get; } [Export ("addCursorRect:cursor:")] - void AddCursorRect (RectangleF aRect, NSCursor cursor); + void AddCursorRect (NSRect aRect, NSCursor cursor); [Export ("removeCursorRect:cursor:")] - void RemoveCursorRect (RectangleF aRect, NSCursor cursor); + void RemoveCursorRect (NSRect aRect, NSCursor cursor); [Export ("discardCursorRects")] void DiscardCursorRects (); @@ -10619,10 +10698,10 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void ResetCursorRects (); [Export ("addTrackingRect:owner:userData:assumeInside:")] - int AddTrackingRect (RectangleF aRect, NSObject anObject, IntPtr data, bool assumeInside); + NSInteger AddTrackingRect (NSRect aRect, NSObject anObject, IntPtr data, bool assumeInside); [Export ("removeTrackingRect:")] - void RemoveTrackingRect (int tag); + void RemoveTrackingRect (NSInteger tag); [Export ("makeBackingLayer")] CALayer MakeBackingLayer (); @@ -10653,10 +10732,10 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon NSMenu DefaultMenu (); [Export ("addToolTipRect:owner:userData:")] - int AddToolTip (RectangleF aRect, NSObject anObject, IntPtr data); + NSInteger AddToolTip (NSRect aRect, NSObject anObject, IntPtr data); [Export ("removeToolTip:")] - void RemoveToolTip (int tag); + void RemoveToolTip (NSInteger tag); [Export ("removeAllToolTips")] void RemoveAllToolTips (); @@ -10674,7 +10753,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool PreservesContentDuringLiveResize { get; } [Export ("rectPreservedDuringLiveResize")] - RectangleF RectPreservedDuringLiveResize { get; } + NSRect RectPreservedDuringLiveResize { get; } //[Export ("getRectsExposedDuringLiveResize:count:")] // void GetRectsExposedDuringLiveResizecount @@ -10699,19 +10778,19 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon NSViewResizingMask AutoresizingMask { get; set; } [Export ("frame")] - RectangleF Frame { get; set; } + NSRect Frame { get; set; } [Export ("frameRotation")] - float FrameRotation { get; set; } + CGFloat FrameRotation { get; set; } [Export ("frameCenterRotation")] - float FrameCenterRotation { get; set; } + CGFloat FrameCenterRotation { get; set; } [Export ("boundsRotation")] - float BoundsRotation { get; set; } + CGFloat BoundsRotation { get; set; } [Export ("bounds")] - RectangleF Bounds { get; set; } + NSRect Bounds { get; set; } [Export ("canDrawConcurrently")] bool CanDrawConcurrently { get; set; } @@ -10738,7 +10817,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon CALayer Layer { get; set; } [Export ("alphaValue")] - float AlphaValue { get; set; } + CGFloat AlphaValue { get; set; } [Export ("backgroundFilters"), NullAllowed] CIFilter [] BackgroundFilters { get; set; } @@ -10771,14 +10850,14 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon NSDraggingSession BeginDraggingSession (NSDraggingItem [] itmes, NSEvent evnt, NSDraggingSource source); [Export ("dragImage:at:offset:event:pasteboard:source:slideBack:")] - void DragImage (NSImage anImage, PointF viewLocation, SizeF initialOffset, NSEvent theEvent, NSPasteboard pboard, NSObject sourceObj, bool slideFlag); + void DragImage (NSImage anImage, NSPoint viewLocation, NSSize initialOffset, NSEvent theEvent, NSPasteboard pboard, NSObject sourceObj, bool slideFlag); [Export ("dragFile:fromRect:slideBack:event:")] - bool DragFile (string filename, RectangleF aRect, bool slideBack, NSEvent theEvent); - + bool DragFile (string filename, NSRect aRect, bool slideBack, NSEvent theEvent); + [Export ("dragPromisedFilesOfTypes:fromRect:source:slideBack:event:")] - bool DragPromisedFilesOfTypes (string[] typeArray, RectangleF aRect, NSObject sourceObject, bool slideBack, NSEvent theEvent); - + bool DragPromisedFilesOfTypes (string[] typeArray, NSRect aRect, NSObject sourceObject, bool slideBack, NSEvent theEvent); + [Export ("exitFullScreenModeWithOptions:")] void ExitFullscreenModeWithOptions(NSDictionary options); @@ -10858,19 +10937,19 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool TranslatesAutoresizingMaskIntoConstraints { get; set; } [Lion, Export ("alignmentRectForFrame:")] - RectangleF GetAlignmentRectForFrame (RectangleF frame); + NSRect GetAlignmentRectForFrame( NSRect frame ); [Lion, Export ("frameForAlignmentRect:")] - RectangleF GetFrameForAlignmentRect (RectangleF alignmentRect); + NSRect GetFrameForAlignmentRect (NSRect alignmentRect); [Lion, Export ("alignmentRectInsets")] NSEdgeInsets AlignmentRectInsets { get; } [Lion, Export ("baselineOffsetFromBottom")] - float BaselineOffsetFromBottom { get; } + CGFloat BaselineOffsetFromBottom { get; } [Lion, Export ("intrinsicContentSize")] - SizeF IntrinsicContentSize { get; } + NSSize IntrinsicContentSize { get; } [Lion, Export ("invalidateIntrinsicContentSize")] void InvalidateIntrinsicContentSize (); @@ -10888,7 +10967,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void SetContentCompressionResistancePriority (float priority, NSLayoutConstraintOrientation orientation); [Lion, Export ("fittingSize")] - SizeF FittingSize { get; } + NSSize FittingSize { get; } [Lion, Export ("constraintsAffectingLayoutForOrientation:")] NSLayoutConstraint [] GetConstraintsAffectingLayout (NSLayoutConstraintOrientation orientation); @@ -10919,7 +10998,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool CanBecomeKeyView { get; } [Export ("setKeyboardFocusRingNeedsDisplayInRect:")] - void SetKeyboardFocusRingNeedsDisplay (RectangleF rect); + void SetKeyboardFocusRingNeedsDisplay (NSRect rect); [Export ("focusRingType")] NSFocusRingType FocusRingType { get; set; } @@ -10931,7 +11010,7 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon void DrawFocusRingMask (); [Export ("focusRingMaskBounds")] - RectangleF FocusRingMaskBounds { get; } + NSRect FocusRingMaskBounds { get; } [Export ("noteFocusRingMaskChanged")] void NoteFocusRingMaskChanged (); @@ -10940,10 +11019,10 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon bool IsDrawingFindIndicator { get; } [Export ("dataWithEPSInsideRect:")] - NSData DataWithEpsInsideRect (RectangleF rect); + NSData DataWithEpsInsideRect (NSRect rect); [Export ("dataWithPDFInsideRect:")] - NSData DataWithPdfInsideRect (RectangleF rect); + NSData DataWithPdfInsideRect (NSRect rect); [Export ("print:")] void Print (NSObject sender); @@ -10958,82 +11037,83 @@ public partial interface NSView : NSDraggingDestination, NSAnimatablePropertyCon NSAttributedString PageFooter { get; } [Export ("writeEPSInsideRect:toPasteboard:")] - void WriteEpsInsideRect (RectangleF rect, NSPasteboard pboard); + void WriteEpsInsideRect (NSRect rect, NSPasteboard pboard); [Export ("writePDFInsideRect:toPasteboard:")] - void WritePdfInsideRect (RectangleF rect, NSPasteboard pboard); - + void WritePdfInsideRect (NSRect rect, NSPasteboard pboard); + [Export ("drawPageBorderWithSize:")] - void DrawPageBorder (SizeF borderSize); - + void DrawPageBorder (NSSize borderSize); + [Export ("drawSheetBorderWithSize:")] - void DrawSheetBorder (SizeF borderSize); - + void DrawSheetBorder (NSSize borderSize); + [Export ("heightAdjustLimit")] - float HeightAdjustLimit { get; } - + CGFloat HeightAdjustLimit { get; } + [Export ("widthAdjustLimit")] - float WidthAdjustLimit { get; } - + CGFloat WidthAdjustLimit { get; } + [Export ("adjustPageWidthNew:left:right:limit:")] - void AdjustPageWidthNew (ref float newRight, float left, float proposedRight, float rightLimit); - + void AdjustPageWidthNew (ref CGFloat newRight, CGFloat left, CGFloat proposedRight, CGFloat rightLimit); + [Export ("adjustPageHeightNew:top:bottom:limit:")] - void AdjustPageHeightNew (ref float newBottom, float top, float proposedBottom, float bottomLimit); - + void AdjustPageHeightNew (ref CGFloat newBottom, CGFloat top, CGFloat proposedBottom, CGFloat bottomLimit); + [Export ("knowsPageRange:")] bool KnowsPageRange (ref NSRange aRange); [Export ("rectForPage:")] - RectangleF RectForPage (int pageNumber); - + //TODO: figure out size of NSIndex - assuming NSInteger + NSRect RectForPage (NSInteger pageNumber); + [Export ("locationOfPrintRect:")] - PointF LocationOfPrintRect (RectangleF aRect); + NSPoint LocationOfPrintRect (NSRect aRect); [Lion, Export ("wantsBestResolutionOpenGLSurface")] bool WantsBestResolutionOpenGLSurface { get; set; } [Lion, Export ("backingAlignedRect:options:")] - RectangleF BackingAlignedRect (RectangleF aRect, NSAlignmentOptions options); + NSRect BackingAlignedRect (NSRect aRect, NSAlignmentOptions options); [Lion, Export ("convertRectFromBacking:")] - RectangleF ConvertRectFromBacking (RectangleF aRect); + NSRect ConvertRectFromBacking (NSRect aRect); [Lion, Export ("convertRectToBacking:")] - RectangleF ConvertRectToBacking (RectangleF aRect); + NSRect ConvertRectToBacking (NSRect aRect); [Lion, Export ("convertRectFromLayer:")] - RectangleF ConvertRectFromLayer (RectangleF aRect); + NSRect ConvertRectFromLayer (NSRect aRect); [Lion, Export ("convertRectToLayer:")] - RectangleF ConvertRectToLayer (RectangleF aRect); + NSRect ConvertRectToLayer (NSRect aRect); - [Lion, Export ("convertPointFromBacking:")] - PointF ConvertPointFromBacking (PointF aPoint); + [Lion, Export ("convertNSPointromBacking:")] + NSPoint ConvertNSPointromBacking (NSPoint aPoint); [Lion, Export ("convertPointToBacking:")] - PointF ConvertPointToBacking (PointF aPoint); + NSPoint ConvertPointToBacking (NSPoint aPoint); - [Lion, Export ("convertPointFromLayer:")] - PointF ConvertPointFromLayer (PointF aPoint); + [Lion, Export ("convertNSPointromLayer:")] + NSPoint ConvertNSPointromLayer (NSPoint aPoint); [Lion, Export ("convertPointToLayer:")] - PointF ConvertPointToLayer (PointF aPoint); + NSPoint ConvertPointToLayer (NSPoint aPoint); - [Lion, Export ("convertSizeFromBacking:")] - SizeF ConvertSizeFromBacking (SizeF aSize); + [Lion, Export ("convertNSSizeromBacking:")] + NSSize ConvertNSSizeromBacking (NSSize aSize); [Lion, Export ("convertSizeToBacking:")] - SizeF ConvertSizeToBacking (SizeF aSize); + NSSize ConvertSizeToBacking (NSSize aSize); - [Lion, Export ("convertSizeFromLayer:")] - SizeF ConvertSizeFromLayer (SizeF aSize); + [Lion, Export ("convertNSSizeromLayer:")] + NSSize ConvertNSSizeromLayer (NSSize aSize); [Lion, Export ("convertSizeToLayer:")] - SizeF ConvertSizeToLayer (SizeF aSize); - + NSSize ConvertSizeToLayer (NSSize aSize); } + //64 bit reviewed [BaseType (typeof (NSAnimation))] public interface NSViewAnimation { [Export ("initWithViewAnimations:")] @@ -11118,7 +11198,7 @@ public partial interface NSTableColumn : NSUserInterfaceItemIdentification { IntPtr Constructor (NSObject identifier); [Export ("dataCellForRow:")] - NSCell DataCellForRow (int row); + NSCell DataCellForRow (NSInteger row); [Export ("sizeToFit")] void SizeToFit (); @@ -11127,13 +11207,13 @@ public partial interface NSTableColumn : NSUserInterfaceItemIdentification { NSTableView TableView { get; set; } [Export ("width")] - float Width { get; set; } + CGFloat Width { get; set; } [Export ("minWidth")] - float MinWidth { get; set; } + CGFloat MinWidth { get; set; } [Export ("maxWidth")] - float MaxWidth { get; set; } + CGFloat MaxWidth { get; set; } [Export ("headerCell")] NSCell HeaderCell { get; set; } @@ -11179,7 +11259,7 @@ public interface NSTableRowView { NSTableViewDraggingDestinationFeedbackStyle DraggingDestinationFeedbackStyle { get; set; } [Export ("indentationForDropOperation")] - float IndentationForDropOperation { get; set; } + CGFloat IndentationForDropOperation { get; set; } [Export ("interiorBackgroundStyle")] NSBackgroundStyle InteriorBackgroundStyle { get; } @@ -11188,25 +11268,25 @@ public interface NSTableRowView { NSColor BackgroundColor { get; set; } [Export ("numberOfColumns")] - int NumberOfColumns { get; } + NSInteger NumberOfColumns { get; } [Export ("targetForDropOperation")] bool TargetForDropOperation { [Bind ("isTargetForDropOperation")] get; set; } [Export ("drawBackgroundInRect:")] - void DrawBackground (RectangleF dirtyRect); + void DrawBackground (NSRect dirtyRect); [Export ("drawSelectionInRect:")] - void DrawSelection (RectangleF dirtyRect); + void DrawSelection (NSRect dirtyRect); [Export ("drawSeparatorInRect:")] - void DrawSeparator (RectangleF dirtyRect); + void DrawSeparator (NSRect dirtyRect); [Export ("drawDraggingDestinationFeedbackInRect:")] - void DrawDraggingDestinationFeedback (RectangleF dirtyRect); + void DrawDraggingDestinationFeedback (NSRect dirtyRect); [Export ("viewAtColumn:")] - NSView ViewAtColumn (int column); + NSView ViewAtColumn (NSInteger column); } [Lion] @@ -11244,11 +11324,11 @@ NSArray DraggingImageComponents { } public delegate void NSTableViewRowHandler (NSTableRowView rowView, int row); - + //64 bit reviewed [BaseType (typeof (NSControl), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTableViewDelegate)})] public interface NSTableView : NSDraggingSource { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("noteHeightOfRowsWithIndexesChanged:")] void NoteHeightOfRowsWithIndexesChanged (NSIndexSet indexSet ); @@ -11257,10 +11337,10 @@ public interface NSTableView : NSDraggingSource { NSTableColumn[] TableColumns (); [Export ("numberOfColumns")] - int ColumnCount { get; } + NSInteger ColumnCount { get; } [Export ("numberOfRows")] - int RowCount { get; } + NSInteger RowCount { get; } [Export ("addTableColumn:")] void AddColumn (NSTableColumn tableColumn); @@ -11269,10 +11349,10 @@ public interface NSTableView : NSDraggingSource { void RemoveColumn (NSTableColumn tableColumn); [Export ("moveColumn:toColumn:")] - void MoveColumn (int oldIndex, int newIndex); + void MoveColumn (NSInteger oldIndex, NSInteger newIndex); [Export ("columnWithIdentifier:")] - int FindColumn (NSString identifier); + NSInteger FindColumn (NSString identifier); [Export ("tableColumnWithIdentifier:")] NSTableColumn FindTableColumn (NSString identifier); @@ -11287,10 +11367,10 @@ public interface NSTableView : NSDraggingSource { void SizeLastColumnToFit (); [Export ("scrollRowToVisible:")] - void ScrollRowToVisible (int row); + void ScrollRowToVisible (NSInteger row); [Export ("scrollColumnToVisible:")] - void ScrollColumnToVisible (int column); + void ScrollColumnToVisible (NSInteger column); [Export ("reloadData")] void ReloadData (); @@ -11302,16 +11382,16 @@ public interface NSTableView : NSDraggingSource { void ReloadData (NSIndexSet rowIndexes, NSIndexSet columnIndexes ); [Export ("editedColumn")] - int EditedColumn { get; } + NSInteger EditedColumn { get; } [Export ("editedRow")] - int EditedRow { get; } + NSInteger EditedRow { get; } [Export ("clickedColumn")] - int ClickedColumn { get; } + NSInteger ClickedColumn { get; } [Export ("clickedRow")] - int ClickedRow { get; } + NSInteger ClickedRow { get; } [Export ("setIndicatorImage:inTableColumn:")] void SetIndicatorImage ([NullAllowed] NSImage anImage, NSTableColumn tableColumn); @@ -11320,7 +11400,7 @@ public interface NSTableView : NSDraggingSource { NSImage GetIndicatorImage (NSTableColumn tableColumn); [Export ("canDragRowsWithIndexes:atPoint:")] - bool CanDragRows (NSIndexSet rowIndexes, PointF mouseDownPoint ); + bool CanDragRows (NSIndexSet rowIndexes, NSPoint mouseDownPoint ); // FIXME: binding, NSPointPointer //[Export ("dragImageForRowsWithIndexes:tableColumns:event:offset:")] @@ -11330,7 +11410,7 @@ public interface NSTableView : NSDraggingSource { void SetDraggingSourceOperationMask (NSDragOperation mask, bool isLocal); [Export ("setDropRow:dropOperation:")] - void SetDropRowDropOperation (int row, NSTableViewDropOperation dropOperation); + void SetDropRowDropOperation (NSInteger row, NSTableViewDropOperation dropOperation); [Export ("selectAll:")] void SelectAll ([NullAllowed] NSObject sender); @@ -11351,52 +11431,52 @@ public interface NSTableView : NSDraggingSource { NSIndexSet SelectedRows { get; } [Export ("deselectColumn:")] - void DeselectColumn (int column); + void DeselectColumn (NSInteger column); [Export ("deselectRow:")] - void DeselectRow (int row); + void DeselectRow (NSInteger row); [Export ("selectedColumn")] int SelectedColumn { get; } [Export ("selectedRow")] - int SelectedRow { get; } + NSInteger SelectedRow { get; } [Export ("isColumnSelected:")] - bool IsColumnSelected (int column); + bool IsColumnSelected (NSInteger column); [Export ("isRowSelected:")] - bool IsRowSelected (int row); + bool IsRowSelected (NSInteger row); [Export ("numberOfSelectedColumns")] - int SelectedColumnsCount { get; } + NSInteger SelectedColumnsCount { get; } [Export ("numberOfSelectedRows")] - int SelectedRowCount { get; } + NSInteger SelectedRowCount { get; } [Export ("rectOfColumn:")] - RectangleF RectForColumn (int column); + NSRect RectForColumn (NSInteger column); [Export ("rectOfRow:")] - RectangleF RectForRow (int row); + NSRect RectForRow (NSInteger row); [Export ("columnIndexesInRect:")] - NSIndexSet GetColumnIndexesInRect (RectangleF rect); + NSIndexSet GetColumnIndexesInRect (NSRect rect); [Export ("rowsInRect:")] - NSRange RowsInRect (RectangleF rect); + NSRange RowsInRect (NSRect rect); [Export ("columnAtPoint:")] - int GetColumn (PointF point); + NSInteger GetColumn (NSPoint point); [Export ("rowAtPoint:")] - int GetRow (PointF point); + NSInteger GetRow (NSPoint point); [Export ("frameOfCellAtColumn:row:")] - RectangleF GetCellFrame (int column, int row); + NSRect GetCellFrame (NSInteger column, NSInteger row); [Export ("preparedCellAtColumn:row:")] - NSCell GetCell (int column, int row ); + NSCell GetCell (NSInteger column, NSInteger row ); [Export ("textShouldBeginEditing:")] bool TextShouldBeginEditing (NSText textObject); @@ -11414,25 +11494,25 @@ public interface NSTableView : NSDraggingSource { void TextDidChange (NSNotification notification); [Export ("shouldFocusCell:atColumn:row:")] - bool ShouldFocusCell (NSCell cell, int column, int row ); + bool ShouldFocusCell (NSCell cell, NSInteger column, NSInteger row ); [Export ("performClickOnCellAtColumn:row:")] - void PerformClick (int column, int row ); + void PerformClick (NSInteger column, NSInteger row ); [Export ("editColumn:row:withEvent:select:")] - void EditColumn (int column, int row, NSEvent theEvent, bool select); + void EditColumn (NSInteger column, NSInteger row, NSEvent theEvent, bool select); [Export ("drawRow:clipRect:")] - void DrawRow (int row, RectangleF clipRect); + void DrawRow (NSInteger row, NSRect clipRect); [Export ("highlightSelectionInClipRect:")] - void HighlightSelection (RectangleF clipRect); + void HighlightSelection (NSRect clipRect); [Export ("drawGridInClipRect:")] - void DrawGrid (RectangleF clipRect); + void DrawGrid (NSRect clipRect); [Export ("drawBackgroundInClipRect:")] - void DrawBackground (RectangleF clipRect ); + void DrawBackground (NSRect clipRect ); //Detected properties [Export ("dataSource")][NullAllowed] @@ -11466,7 +11546,7 @@ public interface NSTableView : NSDraggingSource { NSTableViewGridStyle GridStyleMask { get; set; } [Export ("intercellSpacing")] - SizeF IntercellSpacing { get; set; } + NSSize IntercellSpacing { get; set; } [Export ("usesAlternatingRowBackgroundColors")] bool UsesAlternatingRowBackgroundColors { get; set; } @@ -11478,7 +11558,7 @@ public interface NSTableView : NSDraggingSource { NSColor GridColor { get; set; } [Export ("rowHeight")] - float RowHeight { get; set; } + CGFloat RowHeight { get; set; } [Export ("doubleAction")] Selector DoubleAction { get; set; } @@ -11517,7 +11597,7 @@ public interface NSTableView : NSDraggingSource { bool AutosaveTableColumns { get; set; } [Export ("focusedColumn")] - int FocusedColumn { get; set; } + NSInteger FocusedColumn { get; set; } [Lion] [Export ("effectiveRowSizeStyle")] @@ -11525,19 +11605,19 @@ public interface NSTableView : NSDraggingSource { [Lion] [Export ("viewAtColumn:row:makeIfNecessary:")] - NSView GetView (int column, int row, bool makeIfNecessary); + NSView GetView (NSInteger column, NSInteger row, bool makeIfNecessary); [Lion] [Export ("rowViewAtRow:makeIfNecessary:")] - NSTableRowView GetRowView (int row, bool makeIfNecessary); + NSTableRowView GetRowView (NSInteger row, bool makeIfNecessary); [Lion] [Export ("rowForView:")] - int RowForView (NSView view); + NSInteger RowForView (NSView view); [Lion] [Export ("columnForView:")] - int ColumnForView (NSView view); + NSInteger ColumnForView (NSView view); [Lion] [Export ("makeViewWithIdentifier:owner:")] @@ -11565,7 +11645,7 @@ public interface NSTableView : NSDraggingSource { [Lion] [Export ("moveRowAtIndex:toIndex:")] - void MoveRow (int oldIndex, int newIndex); + void MoveRow (NSInteger oldIndex, NSInteger newIndex); [Lion] [Export ("rowSizeStyle")] @@ -11578,21 +11658,22 @@ public interface NSTableView : NSDraggingSource { [Field ("NSTableViewRowViewKey")] NSString RowViewKey { get; } } - + + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public partial interface NSTableViewDelegate { [Export ("tableView:willDisplayCell:forTableColumn:row:"), EventArgs ("NSTableViewCell")] - void WillDisplayCell (NSTableView tableView, NSObject cell, NSTableColumn tableColumn, int row); + void WillDisplayCell (NSTableView tableView, NSObject cell, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:shouldEditTableColumn:row:"), DelegateName ("NSTableViewColumnRowPredicate"), DefaultValue (false)] - bool ShouldEditTableColumn (NSTableView tableView, NSTableColumn tableColumn, int row); + bool ShouldEditTableColumn (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Export ("selectionShouldChangeInTableView:"), DelegateName ("NSTableViewPredicate"), DefaultValue (false)] bool SelectionShouldChange (NSTableView tableView); [Export ("tableView:shouldSelectRow:"), DelegateName ("NSTableViewRowPredicate")] [DefaultValue (true)] - bool ShouldSelectRow (NSTableView tableView, int row); + bool ShouldSelectRow (NSTableView tableView, NSInteger row); [Export ("tableView:selectionIndexesForProposedSelection:"), DelegateName ("NSTableViewIndexFilter"), DefaultValueFromArgument ("proposedSelectionIndexes")] NSIndexSet GetSelectionIndexes (NSTableView tableView, NSIndexSet proposedSelectionIndexes); @@ -11610,34 +11691,34 @@ public partial interface NSTableViewDelegate { void DidDragTableColumn (NSTableView tableView, NSTableColumn tableColumn); [Export ("tableView:heightOfRow:"), DelegateName ("NSTableViewRowHeight"), NoDefaultValue] - float GetRowHeight (NSTableView tableView, int row ); + CGFloat GetRowHeight (NSTableView tableView, NSInteger row ); [Export ("tableView:typeSelectStringForTableColumn:row:"), DelegateName ("NSTableViewColumnRowString"), DefaultValue ("String.Empty")] - string GetSelectString (NSTableView tableView, NSTableColumn tableColumn, int row ); + string GetSelectString (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:nextTypeSelectMatchFromRow:toRow:forString:"), DelegateName ("NSTableViewSearchString"), DefaultValue (-1)] - int GetNextTypeSelectMatch (NSTableView tableView, int startRow, int endRow, string searchString); + NSInteger GetNextTypeSelectMatch (NSTableView tableView, NSInteger startRow, NSInteger endRow, string searchString); [Export ("tableView:shouldTypeSelectForEvent:withCurrentSearchString:"), DelegateName ("NSTableViewEventString"), DefaultValue (false)] bool ShouldTypeSelect (NSTableView tableView, NSEvent theEvent, string searchString ); [Export ("tableView:shouldShowCellExpansionForTableColumn:row:"), DelegateName ("NSTableViewColumnRowPredicate"), DefaultValue (false)] - bool ShouldShowCellExpansion (NSTableView tableView, NSTableColumn tableColumn, int row ); + bool ShouldShowCellExpansion (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:shouldTrackCell:forTableColumn:row:"), DelegateName ("NSTableViewCell"), DefaultValue (false)] - bool ShouldTrackCell (NSTableView tableView, NSCell cell, NSTableColumn tableColumn, int row ); + bool ShouldTrackCell (NSTableView tableView, NSCell cell, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:dataCellForTableColumn:row:"), DelegateName ("NSTableViewCellGetter"), NoDefaultValue] - NSCell GetDataCell (NSTableView tableView, NSTableColumn tableColumn, int row ); + NSCell GetDataCell (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:isGroupRow:"), DelegateName ("NSTableViewRowPredicate"), DefaultValue (false)] - bool IsGroupRow (NSTableView tableView, int row ); + bool IsGroupRow (NSTableView tableView, NSInteger row ); [Export ("tableView:sizeToFitWidthOfColumn:"), DelegateName ("NSTableViewColumnWidth"), DefaultValue (80)] - float GetSizeToFitColumnWidth (NSTableView tableView, int column ); + CGFloat GetSizeToFitColumnWidth (NSTableView tableView, NSInteger column ); [Export ("tableView:shouldReorderColumn:toColumn:"), DelegateName ("NSTableReorder"), DefaultValue (false)] - bool ShouldReorder (NSTableView tableView, int columnIndex, int newColumnIndex ); + bool ShouldReorder (NSTableView tableView, NSInteger columnIndex, NSInteger newColumnIndex ); [Export ("tableViewSelectionDidChange:"), EventArgs ("NSNotification")] void SelectionDidChange (NSNotification notification); @@ -11653,33 +11734,34 @@ public partial interface NSTableViewDelegate { [Lion] [Export ("tableView:viewForTableColumn:row:"), DelegateName ("NSTableViewViewGetter"), NoDefaultValue] - NSView GetViewForItem (NSTableView tableView, NSTableColumn tableColumn, int row); + NSView GetViewForItem (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Lion] [Export ("tableView:rowViewForRow:"), DelegateName ("NSTableViewRowGetter"), DefaultValue (null)] - NSTableRowView CoreGetRowView (NSTableView tableView, int row); + NSTableRowView CoreGetRowView (NSTableView tableView, NSInteger row); [Lion] [Export ("tableView:didAddRowView:forRow:"), EventArgs ("NSTableViewRow")] - void DidAddRowView (NSTableView tableView, NSTableRowView rowView, int row); + void DidAddRowView (NSTableView tableView, NSTableRowView rowView, NSInteger row); [Lion] [Export ("tableView:didRemoveRowView:forRow:"), EventArgs ("NSTableViewRow")] - void DidRemoveRowView (NSTableView tableView, NSTableRowView rowView, int row); + void DidRemoveRowView (NSTableView tableView, NSTableRowView rowView, NSInteger row); } - + + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSTableViewDataSource { [Export ("numberOfRowsInTableView:")] - int GetRowCount (NSTableView tableView); + NSInteger GetRowCount (NSTableView tableView); [Export ("tableView:objectValueForTableColumn:row:")] - NSObject GetObjectValue (NSTableView tableView, NSTableColumn tableColumn, int row); + NSObject GetObjectValue (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:setObjectValue:forTableColumn:row:")] - void SetObjectValue (NSTableView tableView, NSObject theObject, NSTableColumn tableColumn, int row); + void SetObjectValue (NSTableView tableView, NSObject theObject, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:sortDescriptorsDidChange:")] void SortDescriptorsChanged (NSTableView tableView, NSSortDescriptor [] oldDescriptors); @@ -11688,31 +11770,32 @@ public interface NSTableViewDataSource { bool WriteRows (NSTableView tableView, NSIndexSet rowIndexes, NSPasteboard pboard ); [Export ("tableView:validateDrop:proposedRow:proposedDropOperation:")] - NSDragOperation ValidateDrop (NSTableView tableView, NSDraggingInfo info, int row, NSTableViewDropOperation dropOperation); + NSDragOperation ValidateDrop (NSTableView tableView, NSDraggingInfo info, NSInteger row, NSTableViewDropOperation dropOperation); [Export ("tableView:acceptDrop:row:dropOperation:")] - bool AcceptDrop (NSTableView tableView, NSDraggingInfo info, int row, NSTableViewDropOperation dropOperation); + bool AcceptDrop (NSTableView tableView, NSDraggingInfo info, NSInteger row, NSTableViewDropOperation dropOperation); [Export ("tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:")] string [] FilesDropped (NSTableView tableView, NSUrl dropDestination, NSIndexSet indexSet ); [Lion] [Export ("tableView:pasteboardWriterForRow:")] - NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, int row); + NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, NSInteger row); [Lion] [Export ("tableView:draggingSession:willBeginAtPoint:forRowIndexes:")] - void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, PointF willBeginAtScreenPoint, NSIndexSet rowIndexes); + void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, NSPoint willBeginAtScreenPoint, NSIndexSet rowIndexes); [Lion] [Export ("tableView:draggingSession:endedAtPoint:operation:")] - void DraggingSessionEnded (NSTableView tableView, NSDraggingSession draggingSession, PointF endedAtScreenPoint, NSDragOperation operation); + void DraggingSessionEnded (NSTableView tableView, NSDraggingSession draggingSession, NSPoint endedAtScreenPoint, NSDragOperation operation); [Lion] [Export ("tableView:updateDraggingItemsForDrag:")] void UpdateDraggingItems (NSTableView tableView, NSDraggingInfo draggingInfo); } + //64 bit reviewed // // This is the mixed NSTableViewDataSource and NSTableViewDelegate // @@ -11723,16 +11806,16 @@ public interface NSTableViewSource { // These come form NSTableViewDataSource // [Export ("tableView:willDisplayCell:forTableColumn:row:")] - void WillDisplayCell (NSTableView tableView, NSObject cell, NSTableColumn tableColumn, int row); + void WillDisplayCell (NSTableView tableView, NSObject cell, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:shouldEditTableColumn:row:")] [DefaultValue (false)] - bool ShouldEditTableColumn (NSTableView tableView, NSTableColumn tableColumn, int row); + bool ShouldEditTableColumn (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Export ("selectionShouldChangeInTableView:")] [DefaultValue (false)] bool SelectionShouldChange (NSTableView tableView); [Export ("tableView:shouldSelectRow:")] [DefaultValue (true)] - bool ShouldSelectRow (NSTableView tableView, int row); + bool ShouldSelectRow (NSTableView tableView, NSInteger row); [Export ("tableView:selectionIndexesForProposedSelection:")] NSIndexSet GetSelectionIndexes (NSTableView tableView, NSIndexSet proposedSelectionIndexes); @@ -11751,37 +11834,37 @@ public interface NSTableViewSource { //FIXME: Binding NSRectPointer //[Export ("tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:")] - //string TableViewtoolTipForCellrecttableColumnrowmouseLocation (NSTableView tableView, NSCell cell, NSRectPointer rect, NSTableColumn tableColumn, int row, PointF mouseLocation); + //string TableViewtoolTipForCellrecttableColumnrowmouseLocation (NSTableView tableView, NSCell cell, NSRectPointer rect, NSTableColumn tableColumn, int row, NSPoint mouseLocation); [Export ("tableView:heightOfRow:")] - float GetRowHeight (NSTableView tableView, int row ); + CGFloat GetRowHeight (NSTableView tableView, NSInteger row ); [Export ("tableView:typeSelectStringForTableColumn:row:")] - string GetSelectString (NSTableView tableView, NSTableColumn tableColumn, int row ); + string GetSelectString (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:nextTypeSelectMatchFromRow:toRow:forString:")] - int GetNextTypeSelectMatch (NSTableView tableView, int startRow, int endRow, string searchString ); + NSInteger GetNextTypeSelectMatch (NSTableView tableView, NSInteger startRow, NSInteger endRow, string searchString ); [Export ("tableView:shouldTypeSelectForEvent:withCurrentSearchString:")] bool ShouldTypeSelect (NSTableView tableView, NSEvent theEvent, string searchString ); [Export ("tableView:shouldShowCellExpansionForTableColumn:row:")] - bool ShouldShowCellExpansion (NSTableView tableView, NSTableColumn tableColumn, int row ); + bool ShouldShowCellExpansion (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:shouldTrackCell:forTableColumn:row:")] - bool ShouldTrackCell (NSTableView tableView, NSCell cell, NSTableColumn tableColumn, int row ); + bool ShouldTrackCell (NSTableView tableView, NSCell cell, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:dataCellForTableColumn:row:")] - NSCell GetCell (NSTableView tableView, NSTableColumn tableColumn, int row ); + NSCell GetCell (NSTableView tableView, NSTableColumn tableColumn, NSInteger row ); [Export ("tableView:isGroupRow:"), DefaultValue (false)] - bool IsGroupRow (NSTableView tableView, int row ); + bool IsGroupRow (NSTableView tableView, NSInteger row ); [Export ("tableView:sizeToFitWidthOfColumn:")] - float GetSizeToFitColumnWidth (NSTableView tableView, int column ); + CGFloat GetSizeToFitColumnWidth (NSTableView tableView, NSInteger column ); [Export ("tableView:shouldReorderColumn:toColumn:")] - bool ShouldReorder (NSTableView tableView, int columnIndex, int newColumnIndex ); + bool ShouldReorder (NSTableView tableView, NSInteger columnIndex, NSInteger newColumnIndex ); [Export ("tableViewSelectionDidChange:")] void SelectionDidChange (NSNotification notification); @@ -11797,13 +11880,13 @@ public interface NSTableViewSource { // NSTableViewDataSource [Export ("numberOfRowsInTableView:")] - int GetRowCount (NSTableView tableView); + NSInteger GetRowCount (NSTableView tableView); [Export ("tableView:objectValueForTableColumn:row:")] - NSObject GetObjectValue (NSTableView tableView, NSTableColumn tableColumn, int row); + NSObject GetObjectValue (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:setObjectValue:forTableColumn:row:")] - void SetObjectValue (NSTableView tableView, NSObject theObject, NSTableColumn tableColumn, int row); + void SetObjectValue (NSTableView tableView, NSObject theObject, NSTableColumn tableColumn, NSInteger row); [Export ("tableView:sortDescriptorsDidChange:")] void SortDescriptorsChanged (NSTableView tableView, NSSortDescriptor [] oldDescriptors); @@ -11812,91 +11895,94 @@ public interface NSTableViewSource { bool WriteRows (NSTableView tableView, NSIndexSet rowIndexes, NSPasteboard pboard ); [Export ("tableView:validateDrop:proposedRow:proposedDropOperation:")] - NSDragOperation ValidateDrop (NSTableView tableView, NSDraggingInfo info, int row, NSTableViewDropOperation dropOperation); + NSDragOperation ValidateDrop (NSTableView tableView, NSDraggingInfo info, NSInteger row, NSTableViewDropOperation dropOperation); [Export ("tableView:acceptDrop:row:dropOperation:")] - bool AcceptDrop (NSTableView tableView, NSDraggingInfo info, int row, NSTableViewDropOperation dropOperation); + bool AcceptDrop (NSTableView tableView, NSDraggingInfo info, NSInteger row, NSTableViewDropOperation dropOperation); [Export ("tableView:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:")] string [] FilesDropped (NSTableView tableView, NSUrl dropDestination, NSIndexSet indexSet ); [Lion] [Export ("tableView:viewForTableColumn:row:")] - NSView GetViewForItem (NSTableView tableView, NSTableColumn tableColumn, int row); + NSView GetViewForItem (NSTableView tableView, NSTableColumn tableColumn, NSInteger row); [Lion] [Export ("tableView:rowViewForRow:")] - NSTableRowView GetRowView (NSTableView tableView, int row); + NSTableRowView GetRowView (NSTableView tableView, NSInteger row); [Lion] [Export ("tableView:didAddRowView:forRow:")] - void DidAddRowView (NSTableView tableView, NSTableRowView rowView, int row); + void DidAddRowView (NSTableView tableView, NSTableRowView rowView, NSInteger row); [Lion] [Export ("tableView:didRemoveRowView:forRow:")] - void DidRemoveRowView (NSTableView tableView, NSTableRowView rowView, int row); + void DidRemoveRowView (NSTableView tableView, NSTableRowView rowView, NSInteger row); [Lion] [Export ("tableView:pasteboardWriterForRow:")] - NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, int row); + NSPasteboardWriting GetPasteboardWriterForRow (NSTableView tableView, NSInteger row); [Lion] [Export ("tableView:draggingSession:willBeginAtPoint:forRowIndexes:")] - void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, PointF willBeginAtScreenPoint, NSIndexSet rowIndexes); + void DraggingSessionWillBegin (NSTableView tableView, NSDraggingSession draggingSession, NSPoint willBeginAtScreenPoint, NSIndexSet rowIndexes); [Lion] [Export ("tableView:draggingSession:endedAtPoint:operation:")] - void DraggingSessionEnded (NSTableView tableView, NSDraggingSession draggingSession, PointF endedAtScreenPoint, NSDragOperation operation); + void DraggingSessionEnded (NSTableView tableView, NSDraggingSession draggingSession, NSPoint endedAtScreenPoint, NSDragOperation operation); [Lion] [Export ("tableView:updateDraggingItemsForDrag:")] void UpdateDraggingItems (NSTableView tableView, NSDraggingInfo draggingInfo); } - + + //64 bit reviewed [BaseType (typeof (NSTextFieldCell))] public interface NSTableHeaderCell { [Export ("drawSortIndicatorWithFrame:inView:ascending:priority:")] - void DrawSortIndicator (RectangleF cellFrame, NSView controlView, bool ascending, int priority ); + void DrawSortIndicator (NSRect cellFrame, NSView controlView, bool ascending, NSInteger priority ); [Export ("sortIndicatorRectForBounds:")] - RectangleF GetSortIndicatorRect (RectangleF theRect ); + NSRect GetSortIndicatorRect (NSRect theRect ); } - + + //64 bit reviewed [BaseType (typeof (NSView))] public interface NSTableHeaderView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("draggedColumn")] - int DraggedColumn { get; } + NSInteger DraggedColumn { get; } [Export ("draggedDistance")] - float DraggedDistance { get; } + CGFloat DraggedDistance { get; } [Export ("resizedColumn")] - int ResizedColumn { get; } + NSInteger ResizedColumn { get; } [Export ("headerRectOfColumn:")] - RectangleF GetHeaderRect (int column); + NSRect GetHeaderRect (NSInteger column); [Export ("columnAtPoint:")] - int GetColumn (PointF point); + NSInteger GetColumn (NSPoint point); //Detected properties [Export ("tableView")] NSTableView TableView { get; set; } } + //64 bit reviewed [BaseType (typeof (NSView), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTabViewDelegate)})] public partial interface NSTabView { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("selectTabViewItem:")] void Select (NSTabViewItem tabViewItem); [Export ("selectTabViewItemAtIndex:")] - void SelectAt (int index); + void SelectAt (NSInteger index); [Export ("selectTabViewItemWithIdentifier:")] void Select (NSObject identifier); @@ -11932,7 +12018,7 @@ public partial interface NSTabView { bool AllowsTruncatedLabels { get; set; } [Export ("minimumSize")] - SizeF MinimumSize { get; } + NSSize MinimumSize { get; } [Export ("drawsBackground")] bool DrawsBackground { get; set; } @@ -11947,7 +12033,7 @@ public partial interface NSTabView { void Add (NSTabViewItem tabViewItem); [Export ("insertTabViewItem:atIndex:")] - void Insert (NSTabViewItem tabViewItem, int index); + void Insert (NSTabViewItem tabViewItem, NSInteger index); [Export ("removeTabViewItem:")] void Remove (NSTabViewItem tabViewItem); @@ -11956,24 +12042,25 @@ public partial interface NSTabView { NSTabViewDelegate Delegate { get; set; } [Export ("tabViewItemAtPoint:")] - NSTabViewItem TabViewItemAtPoint (PointF point); + NSTabViewItem TabViewItemAtPoint (NSPoint point); [Export ("contentRect")] - RectangleF ContentRect { get; } + NSRect ContentRect { get; } [Export ("numberOfTabViewItems")] - int Count { get; } + NSInteger Count { get; } [Export ("indexOfTabViewItem:")] - int IndexOf (NSTabViewItem tabViewItem); + NSInteger IndexOf (NSTabViewItem tabViewItem); [Export ("tabViewItemAtIndex:")] - NSTabViewItem Item (int index); + NSTabViewItem Item (NSInteger index); [Export ("indexOfTabViewItemWithIdentifier:")] - int IndexOf (NSObject identifier); + NSInteger IndexOf (NSObject identifier); } + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSTabViewDelegate { @@ -11990,6 +12077,7 @@ public interface NSTabViewDelegate { void NumberOfItemsChanged (NSTabView tabView); } + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTabViewItem { [Export ("initWithIdentifier:")] @@ -12017,16 +12105,17 @@ public interface NSTabViewItem { NSTabView TabView { get; } [Export ("drawLabel:inRect:")] - void DrawLabel (bool shouldTruncateLabel, RectangleF labelRect); + void DrawLabel (bool shouldTruncateLabel, NSRect labelRect); [Export ("sizeOfLabel:")] - SizeF SizeOfLabel (bool computeMin); + NSSize SizeOfLabel (bool computeMin); } - + + //64 bit reviewed [BaseType (typeof (NSView), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextDelegate)})] public interface NSText { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("replaceCharactersInRange:withString:")] void Replace (NSRange range, string aString); @@ -12174,10 +12263,10 @@ public interface NSText { NSWritingDirection BaseWritingDirection { get; set; } [Export ("maxSize")] - SizeF MaxSize { get; set; } + NSSize MaxSize { get; set; } [Export ("minSize")] - SizeF MinSize { get; set; } + NSSize MinSize { get; set; } [Export ("horizontallyResizable")] bool HorizontallyResizable { [Bind ("isHorizontallyResizable")]get; set; } @@ -12186,6 +12275,7 @@ public interface NSText { bool VerticallyResizable { [Bind ("isVerticallyResizable")]get; set; } } + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSTextDelegate { @@ -12205,45 +12295,47 @@ public interface NSTextDelegate { void TextDidChange (NSNotification notification); } + //64 bit reviewed [BaseType (typeof (NSCell))] public interface NSTextAttachmentCell { [Export ("wantsToTrackMouse")] bool WantsToTrackMouse (); [Export ("highlight:withFrame:inView:")] - void Highlight (bool highlight, RectangleF cellFrame, NSView controlView); + void Highlight (bool highlight, NSRect cellFrame, NSView controlView); [Export ("trackMouse:inRect:ofView:untilMouseUp:")] - bool TrackMouse (NSEvent theEvent, RectangleF cellFrame, NSView controlView, bool untilMouseUp); + bool TrackMouse (NSEvent theEvent, NSRect cellFrame, NSView controlView, bool untilMouseUp); [Export ("cellSize")] - SizeF CellSize { get; } + NSSize CellSize { get; } [Export ("cellBaselineOffset")] - PointF CellBaselineOffset { get; } + NSPoint CellBaselineOffset { get; } [Export ("drawWithFrame:inView:characterIndex:")] - void DrawWithFrame (RectangleF cellFrame, NSView controlView, uint charIndex); + void DrawWithFrame (NSRect cellFrame, NSView controlView, NSUInteger charIndex); [Abstract] [Export ("drawWithFrame:inView:characterIndex:layoutManager:")] - void DrawWithFrame (RectangleF cellFrame, NSView controlView, uint charIndex, NSLayoutManager layoutManager); + void DrawWithFrame (NSRect cellFrame, NSView controlView, NSUInteger charIndex, NSLayoutManager layoutManager); [Abstract] [Export ("wantsToTrackMouseForEvent:inRect:ofView:atCharacterIndex:")] - bool WantsToTrackMouse (NSEvent theEvent, RectangleF cellFrame, NSView controlView, uint charIndex); + bool WantsToTrackMouse (NSEvent theEvent, NSRect cellFrame, NSView controlView, NSUInteger charIndex); [Export ("trackMouse:inRect:ofView:atCharacterIndex:untilMouseUp:")] - bool TrackMouse (NSEvent theEvent, RectangleF cellFrame, NSView controlView, uint charIndex, bool untilMouseUp); + bool TrackMouse (NSEvent theEvent, NSRect cellFrame, NSView controlView, NSUInteger charIndex, bool untilMouseUp); [Export ("cellFrameForTextContainer:proposedLineFragment:glyphPosition:characterIndex:")] - RectangleF CellFrameForTextContainer (NSTextContainer textContainer, RectangleF lineFrag, PointF position, uint charIndex); + NSRect CellFrameForTextContainer (NSTextContainer textContainer, NSRect lineFrag, NSPoint position, NSUInteger charIndex); //Detected properties [Export ("attachment")] NSTextAttachment Attachment { get; set; } } + // 64bit reviewed [BaseType (typeof (NSObject))] public interface NSTextAttachment { [Export ("initWithFileWrapper:")] @@ -12258,34 +12350,35 @@ public interface NSTextAttachment { } + // 64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTextBlock { [Export ("setValue:type:forDimension:")] - void SetValue (float val, NSTextBlockValueType type, NSTextBlockDimension dimension); + void SetValue (CGFloat val, NSTextBlockValueType type, NSTextBlockDimension dimension); [Export ("valueForDimension:")] - float GetValue (NSTextBlockDimension dimension); + CGFloat GetValue (NSTextBlockDimension dimension); [Export ("valueTypeForDimension:")] NSTextBlockValueType GetValueType (NSTextBlockDimension dimension); [Export ("setContentWidth:type:")] - void SetContentWidth (float val, NSTextBlockValueType type); + void SetContentWidth (CGFloat val, NSTextBlockValueType type); [Export ("contentWidth")] - float ContentWidth { get; } + CGFloat ContentWidth { get; } [Export ("contentWidthValueType")] NSTextBlockValueType ContentWidthValueType { get; } [Export ("setWidth:type:forLayer:edge:")] - void SetWidth (float val, NSTextBlockValueType type, NSTextBlockLayer layer, NSRectEdge edge); + void SetWidth (CGFloat val, NSTextBlockValueType type, NSTextBlockLayer layer, NSRectEdge edge); [Export ("setWidth:type:forLayer:")] - void SetWidth (float val, NSTextBlockValueType type, NSTextBlockLayer layer); + void SetWidth (CGFloat val, NSTextBlockValueType type, NSTextBlockLayer layer); [Export ("widthForLayer:edge:")] - float GetWidth (NSTextBlockLayer layer, NSRectEdge edge); + CGFloat GetWidth (NSTextBlockLayer layer, NSRectEdge edge); [Export ("widthValueTypeForLayer:edge:")] NSTextBlockValueType WidthValueTypeForLayer (NSTextBlockLayer layer, NSRectEdge edge); @@ -12300,13 +12393,13 @@ public interface NSTextBlock { NSColor GetBorderColor (NSRectEdge edge); [Export ("rectForLayoutAtPoint:inRect:textContainer:characterRange:")] - RectangleF GetRectForLayout (PointF startingPoint, RectangleF rect, NSTextContainer textContainer, NSRange charRange); + NSRect GetRectForLayout (NSPoint startingPoint, NSRect rect, NSTextContainer textContainer, NSRange charRange); [Export ("boundsRectForContentRect:inRect:textContainer:characterRange:")] - RectangleF GetBoundsRect (RectangleF contentRect, RectangleF rect, NSTextContainer textContainer, NSRange charRange); + NSRect GetBoundsRect (NSRect contentRect, NSRect rect, NSTextContainer textContainer, NSRange charRange); [Export ("drawBackgroundWithFrame:inView:characterRange:layoutManager:")] - void DrawBackground (RectangleF frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager); + void DrawBackground (NSRect frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager); //Detected properties [Export ("verticalAlignment")] @@ -12316,11 +12409,11 @@ public interface NSTextBlock { NSColor BackgroundColor { get; set; } } - + //64 bit reviewed [BaseType (typeof (NSControl), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextFieldDelegate)})] public partial interface NSTextField { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("selectText:")] void SelectText (NSObject sender); @@ -12380,11 +12473,11 @@ public partial interface NSTextField { [Export ("importsGraphics")] bool ImportsGraphics { get; set; } } - + // 64 bit reviewed [BaseType (typeof (NSTextField))] public interface NSSecureTextField { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); } [BaseType (typeof (NSObject))] @@ -12409,7 +12502,7 @@ public interface NSTextFieldDelegate { bool DoCommandBySelector (NSControl control, NSTextView textView, Selector commandSelector); [Export ("control:textView:completions:forPartialWordRange:indexOfSelectedItem:"), DelegateName ("NSControlTextFilter"), DefaultValue ("new string[0]")] - string [] GetCompletions (NSControl control, NSTextView textView, string [] words, NSRange charRange, int index); + string [] GetCompletions (NSControl control, NSTextView textView, string [] words, NSRange charRange, NSInteger index); [Export ("controlTextDidEndEditing:"), EventArgs ("NSNotification")] void EditingEnded (NSNotification notification); @@ -12420,7 +12513,8 @@ public interface NSTextFieldDelegate { [Export ("controlTextDidBeginEditing:"), EventArgs ("NSNotification")] void EditingBegan (NSNotification notification); } - + + //64 bit reviewed [BaseType (typeof (NSActionCell))] public interface NSTextFieldCell { [Export ("initTextCell:")] @@ -12465,6 +12559,7 @@ public interface NSSecureTextFieldCell { bool EchosBullets { get; set; } } + // 64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTextInputContext { [Static] @@ -12491,6 +12586,7 @@ public interface NSTextInputContext { string LocalizedNameForInputSource (string inputSourceIdentifier); } + // 64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTextList { [Export ("initWithMarkerFormat:options:")] @@ -12503,49 +12599,51 @@ public interface NSTextList { NSTextListOptions ListOptions { get; } [Export ("markerForItemNumber:")] - string GetMarker (int itemNum); + string GetMarker (NSInteger itemNum); //Detected properties [Export ("startingItemNumber")] - int StartingItemNumber { get; set; } + NSInteger StartingItemNumber { get; set; } } - + + //64 bit reviewed [BaseType (typeof (NSTextBlock))] public interface NSTextTableBlock { [Export ("initWithTable:startingRow:rowSpan:startingColumn:columnSpan:")] - IntPtr Constructor (NSTextTable table, int row, int rowSpan, int col, int colSpan); + IntPtr Constructor (NSTextTable table, NSInteger row, NSInteger rowSpan, NSInteger col, NSInteger colSpan); [Export ("table")] NSTextTable Table { get; } [Export ("startingRow")] - int StartingRow { get; } + NSInteger StartingRow { get; } [Export ("rowSpan")] - int RowSpan { get; } + NSInteger RowSpan { get; } [Export ("startingColumn")] - int StartingColumn { get; } + NSInteger StartingColumn { get; } [Export ("columnSpan")] - int ColumnSpan { get; } + NSInteger ColumnSpan { get; } } + // 64 bit reviewed [BaseType (typeof (NSTextBlock))] public interface NSTextTable { [Export ("rectForBlock:layoutAtPoint:inRect:textContainer:characterRange:")] - RectangleF GetRectForBlock (NSTextTableBlock block, PointF startingPoint, RectangleF rect, NSTextContainer textContainer, NSRange charRange); + NSRect GetRectForBlock (NSTextTableBlock block, NSPoint startingPoint, NSRect rect, NSTextContainer textContainer, NSRange charRange); [Export ("boundsRectForBlock:contentRect:inRect:textContainer:characterRange:")] - RectangleF GetBoundsRect (NSTextTableBlock block, RectangleF contentRect, RectangleF rect, NSTextContainer textContainer, NSRange charRange); + NSRect GetBoundsRect (NSTextTableBlock block, NSRect contentRect, NSRect rect, NSTextContainer textContainer, NSRange charRange); [Export ("drawBackgroundForBlock:withFrame:inView:characterRange:layoutManager:")] - void DrawBackground (NSTextTableBlock block, RectangleF frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager); + void DrawBackground (NSTextTableBlock block, NSRect frameRect, NSView controlView, NSRange charRange, NSLayoutManager layoutManager); //Detected properties [Export ("numberOfColumns")] - int Columns { get; set; } + NSInteger Columns { get; set; } [Export ("layoutAlgorithm")] NSTextTableLayoutAlgorithm LayoutAlgorithm { get; set; } @@ -12557,23 +12655,24 @@ public interface NSTextTable { bool HidesEmptyCells { get; set; } } + //64 bit reviewed [BaseType (typeof (NSObject))] public partial interface NSTextContainer { [Export ("initWithContainerSize:")] - IntPtr Constructor (SizeF size); + IntPtr Constructor (NSSize size); [Export ("replaceLayoutManager:")] void ReplaceLayoutManager (NSLayoutManager newLayoutManager); // FIXME: Binding //[Export ("lineFragmentRectForProposedRect:sweepDirection:movementDirection:remainingRect:")] - //RectangleF LineFragmentRect (RectangleF proposedRect, NSLineSweepDirection sweepDirection, NSLineMovementDirection movementDirection, NSRectPointer remainingRect); + //NSRect LineFragmentRect (NSRect proposedRect, NSLineSweepDirection sweepDirection, NSLineMovementDirection movementDirection, NSRectPointer remainingRect); [Export ("isSimpleRectangularTextContainer")] bool IsSimpleRectangularTextContainer { get; } [Export ("containsPoint:")] - bool ContainsPoint (PointF point); + bool ContainsPoint (NSPoint point); //Detected properties [Export ("layoutManager")] @@ -12589,12 +12688,12 @@ public partial interface NSTextContainer { bool HeightTracksTextView { get; set; } [Export ("containerSize")] - SizeF ContainerSize { get; set; } + NSSize ContainerSize { get; set; } [Export ("lineFragmentPadding")] - float LineFragmentPadding { get; set; } + CGFloat LineFragmentPadding { get; set; } } - + //64 bit reviewed [BaseType (typeof (NSMutableAttributedString), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextStorageDelegate)})] public interface NSTextStorage { [Export ("addLayoutManager:")] @@ -12607,7 +12706,7 @@ public interface NSTextStorage { NSLayoutManager [] LayoutManagers { get; } [Export ("edited:range:changeInLength:")] - void Edited (uint editedMask, NSRange range, int delta); + void Edited (NSUInteger editedMask, NSRange range, NSInteger delta); [Export ("processEditing")] void ProcessEditing (); @@ -12628,7 +12727,7 @@ public interface NSTextStorage { NSRange EditedRange { get; } [Export ("changeInLength")] - int ChangeInLength { get; } + NSInteger ChangeInLength { get; } //Detected properties [Export ("delegate")] @@ -12648,10 +12747,11 @@ public interface NSTextStorageDelegate { void TextStorageDidProcessEditing (NSNotification notification); } + // 64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTextTab { [Export ("initWithTextAlignment:location:options:")] - IntPtr Constructor (NSTextAlignment alignment, float loc, NSDictionary options); + IntPtr Constructor (NSTextAlignment alignment, CGFloat loc, NSDictionary options); [Export ("alignment")] NSTextAlignment Alignment { get; } @@ -12660,28 +12760,29 @@ public interface NSTextTab { NSDictionary Options { get; } [Export ("initWithType:location:")] - IntPtr Constructor (NSTextTabType type, float loc); + IntPtr Constructor (NSTextTabType type, CGFloat loc); [Export ("location")] - float Location { get; } + CGFloat Location { get; } [Export ("tabStopType")] NSTextTabType TabStopType { get; } } + //64 bit reviewed [BaseType (typeof (NSText), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSTextViewDelegate)})] public partial interface NSTextView : NSDraggingSource { [Export ("initWithFrame:textContainer:")] - IntPtr Constructor (RectangleF frameRect, NSTextContainer container); + IntPtr Constructor (NSRect frameRect, NSTextContainer container); [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("replaceTextContainer:")] void ReplaceTextContainer (NSTextContainer newContainer); [Export ("textContainerOrigin")] - PointF TextContainerOrigin { get; } + NSPoint TextContainerOrigin { get; } [Export ("invalidateTextContainerOrigin")] void InvalidateTextContainerOrigin (); @@ -12696,7 +12797,7 @@ public partial interface NSTextView : NSDraggingSource { void InsertText (NSObject insertString); [Export ("setConstrainedFrameSize:")] - void SetConstrainedFrameSize (SizeF desiredSize); + void SetConstrainedFrameSize (NSSize desiredSize); [Export ("setAlignment:range:")] void SetAlignmentRange (NSTextAlignment alignment, NSRange range); @@ -12780,28 +12881,28 @@ public partial interface NSTextView : NSDraggingSource { bool RulerViewShouldAddMarker (NSRulerView ruler, NSRulerMarker marker); [Export ("rulerView:willMoveMarker:toLocation:")] - float RulerViewWillMoveMarker (NSRulerView ruler, NSRulerMarker marker, float location); + CGFloat RulerViewWillMoveMarker (NSRulerView ruler, NSRulerMarker marker, CGFloat location); [Export ("rulerView:shouldRemoveMarker:")] bool RulerViewShouldRemoveMarker (NSRulerView ruler, NSRulerMarker marker); [Export ("rulerView:willAddMarker:atLocation:")] - float RulerViewWillAddMarker (NSRulerView ruler, NSRulerMarker marker, float location); + CGFloat RulerViewWillAddMarker (NSRulerView ruler, NSRulerMarker marker, CGFloat location); [Export ("rulerView:handleMouseDown:")] void RulerViewHandleMouseDown (NSRulerView ruler, NSEvent theEvent); [Export ("setNeedsDisplayInRect:avoidAdditionalLayout:")] - void SetNeedsDisplay (RectangleF rect, bool avoidAdditionalLayout); + void SetNeedsDisplay (NSRect rect, bool avoidAdditionalLayout); [Export ("shouldDrawInsertionPoint")] bool ShouldDrawInsertionPoint { get; } [Export ("drawInsertionPointInRect:color:turnedOn:")] - void DrawInsertionPoint (RectangleF rect, NSColor color, bool turnedOn); + void DrawInsertionPoint (NSRect rect, NSColor color, bool turnedOn); [Export ("drawViewBackgroundInRect:")] - void DrawViewBackgroundInRect (RectangleF rect); + void DrawViewBackgroundInRect (NSRect rect); [Export ("updateRuler")] void UpdateRuler (); @@ -12816,7 +12917,7 @@ public partial interface NSTextView : NSDraggingSource { NSRange SelectionRange (NSRange proposedCharRange, NSSelectionGranularity granularity); [Export ("clickedOnLink:atIndex:")] - void ClickedOnLink (NSObject link, uint charIndex); + void ClickedOnLink (NSObject link, NSUInteger charIndex); [Export ("startSpeaking:")] void StartSpeaking (NSObject sender); @@ -12825,14 +12926,14 @@ public partial interface NSTextView : NSDraggingSource { void StopSpeaking (NSObject sender); [Export ("characterIndexForInsertionAtPoint:")] - uint CharacterIndex (PointF point); + uint CharacterIndex (NSPoint point); //Detected properties [Export ("textContainer")] NSTextContainer TextContainer { get; set; } [Export ("textContainerInset")] - SizeF TextContainerInset { get; set; } + NSSize TextContainerInset { get; set; } // // Completion support @@ -12844,10 +12945,10 @@ public partial interface NSTextView : NSDraggingSource { NSRange RangeForUserCompletion (); [Export ("completionsForPartialWordRange:indexOfSelectedItem:")] - string [] CompletionsForPartialWord (NSRange charRange, out int index); + string [] CompletionsForPartialWord (NSRange charRange, out NSInteger index); [Export ("insertCompletion:forPartialWordRange:movement:isFinal:")] - void InsertCompletion (string completion, NSRange partialWordCharRange, int movement, bool isFinal); + void InsertCompletion (string completion, NSRange partialWordCharRange, NSInteger movement, bool isFinal); // Pasteboard [Export ("writablePasteboardTypes")] @@ -12917,13 +13018,13 @@ public partial interface NSTextView : NSDraggingSource { void ToggleContinuousSpellChecking (NSObject sender); [Export ("spellCheckerDocumentTag")] - int SpellCheckerDocumentTag (); + NSInteger SpellCheckerDocumentTag (); [Export ("toggleGrammarChecking:")] void ToggleGrammarChecking (NSObject sender); [Export ("setSpellingState:range:")] - void SetSpellingState (int value, NSRange charRange); + void SetSpellingState (NSInteger value, NSRange charRange); [Export ("shouldChangeTextInRanges:replacementStrings:")] bool ShouldChangeText (NSArray /* NSRange [] */ affectedRanges, string [] replacementStrings); @@ -13111,7 +13212,7 @@ public partial interface NSTextView : NSDraggingSource { void CheckText (NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options); [Export ("handleTextCheckingResults:forRange:types:options:orthography:wordCount:")] - void HandleTextChecking (NSTextCheckingResult [] results, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, NSOrthography orthography, int wordCount); + void HandleTextChecking (NSTextCheckingResult [] results, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, NSOrthography orthography, NSInteger wordCount); [Export ("orderFrontSubstitutionsPanel:")] void OrderFrontSubstitutionsPanel (NSObject sender); @@ -13148,21 +13249,21 @@ public partial interface NSTextView : NSDraggingSource { NSTextCheckingTypes EnabledTextCheckingTypes { get; set; } } + //64 bit reviewed [BaseType (typeof (NSTextDelegate))] [Model] public partial interface NSTextViewDelegate { [Export ("textView:clickedOnLink:atIndex:"), DelegateName ("NSTextViewLink"), DefaultValue (false)] - bool LinkClicked (NSTextView textView, NSObject link, uint charIndex); + bool LinkClicked (NSTextView textView, NSObject link, NSUInteger charIndex); [Export ("textView:clickedOnCell:inRect:atIndex:"), EventArgs ("NSTextViewClicked")] - void CellClicked (NSTextView textView, NSTextAttachmentCell cell, RectangleF cellFrame, uint charIndex); + void CellClicked (NSTextView textView, NSTextAttachmentCell cell, NSRect cellFrame, NSUInteger charIndex); [Export ("textView:doubleClickedOnCell:inRect:atIndex:"), EventArgs ("NSTextViewDoubleClick")] - void CellDoubleClicked (NSTextView textView, NSTextAttachmentCell cell, RectangleF cellFrame, uint charIndex); + void CellDoubleClicked (NSTextView textView, NSTextAttachmentCell cell, NSRect cellFrame, NSUInteger charIndex); - // [Export ("textView:writablePasteboardTypesForCell:atIndex:"), DelegateName ("NSTextViewCellPosition"),DefaultValue (null)] - string [] GetWritablePasteboardTypes (NSTextView view, NSTextAttachmentCell forCell, uint charIndex); + string [] GetWritablePasteboardTypes (NSTextView view, NSTextAttachmentCell forCell, NSUInteger charIndex); [Export ("textView:writeCell:atIndex:toPasteboard:type:"), DelegateName ("NSTextViewCellPasteboard"), DefaultValue (true)] bool WriteCell (NSTextView view, NSTextAttachmentCell cell, uint charIndex, NSPasteboard pboard, string type); @@ -13186,10 +13287,10 @@ public partial interface NSTextViewDelegate { void DidChangeTypingAttributes (NSNotification notification); [Export ("textView:willDisplayToolTip:forCharacterAtIndex:"), DelegateName ("NSTextViewTooltip"), DefaultValueFromArgument ("tooltip")] - string WillDisplayToolTip (NSTextView textView, string tooltip, uint characterIndex); + string WillDisplayToolTip (NSTextView textView, string tooltip, NSUInteger characterIndex); [Export ("textView:completions:forPartialWordRange:indexOfSelectedItem:"), DelegateName ("NSTextViewCompletion"), DefaultValue (null)] - string [] GetCompletions (NSTextView textView, string [] words, NSRange charRange, int index); + string [] GetCompletions (NSTextView textView, string [] words, NSRange charRange, NSInteger index); [Export ("textView:shouldChangeTextInRange:replacementString:"), DelegateName ("NSTextViewChangeText"), DefaultValue (true)] bool ShouldChangeTextInRange (NSTextView textView, NSRange affectedCharRange, string replacementString); @@ -13198,29 +13299,29 @@ public partial interface NSTextViewDelegate { bool DoCommandBySelector (NSTextView textView, Selector commandSelector); [Export ("textView:shouldSetSpellingState:range:"), DelegateName ("NSTextViewSpellingQuery"), DefaultValue (0)] - int ShouldSetSpellingState (NSTextView textView, int value, NSRange affectedCharRange); + NSInteger ShouldSetSpellingState (NSTextView textView, NSInteger value, NSRange affectedCharRange); [Export ("textView:menu:forEvent:atIndex:"), DelegateName ("NSTextViewEventMenu"), DefaultValueFromArgument ("menu")] - NSMenu MenuForEvent (NSTextView view, NSMenu menu, NSEvent theEvent, uint charIndex); + NSMenu MenuForEvent (NSTextView view, NSMenu menu, NSEvent theEvent, NSUInteger charIndex); [Export ("textView:willCheckTextInRange:options:types:"), DelegateName ("NSTextViewOnTextCheck"), DefaultValueFromArgument ("options")] NSDictionary WillCheckText (NSTextView view, NSRange range, NSDictionary options, NSTextCheckingTypes checkingTypes); [Export ("textView:didCheckTextInRange:types:options:results:orthography:wordCount:"), DelegateName ("NSTextViewTextChecked"), DefaultValueFromArgument ("results")] - NSTextCheckingResult [] DidCheckText (NSTextView view, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, NSTextCheckingResult [] results, NSOrthography orthography, int wordCount); + NSTextCheckingResult [] DidCheckText (NSTextView view, NSRange range, NSTextCheckingTypes checkingTypes, NSDictionary options, NSTextCheckingResult [] results, NSOrthography orthography, NSInteger wordCount); [Export ("textView:draggedCell:inRect:event:"), EventArgs ("NSTextViewDraggedCell")] - void DraggedCell (NSTextView view, NSTextAttachmentCell cell, RectangleF rect, NSEvent theevent); + void DraggedCell (NSTextView view, NSTextAttachmentCell cell, NSRect rect, NSEvent theevent); [Export ("undoManagerForTextView:"), DelegateName ("NSTextViewGetUndoManager"), DefaultValue (null)] NSUndoManager GetUndoManager (NSTextView view); } - + //64 bit reviewed [BaseType (typeof (NSTextField))] public interface NSTokenField { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); [Export ("tokenStyle")] NSTokenStyle TokenStyle { get; set; } @@ -13247,12 +13348,13 @@ public interface NSTokenField { NSCharacterSet CharacterSet { get; set; } } + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSTokenFieldDelegate { [Abstract] [Export ("tokenField:completionsForSubstring:indexOfToken:indexOfSelectedItem:")] - string [] GetCompletionStrings (NSTokenField tokenField, string substring, int tokenIndex, int selectedIndex); + string [] GetCompletionStrings (NSTokenField tokenField, string substring, NSInteger tokenIndex, NSInteger selectedIndex); [Abstract] [Export ("tokenField:shouldAddObjects:atIndex:")] @@ -13292,16 +13394,17 @@ public interface NSTokenFieldDelegate { } + // 64 bit reviewed [BaseType (typeof (NSObject), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSToolbarDelegate)})] public interface NSToolbar { [Export ("initWithIdentifier:")] IntPtr Constructor (string identifier); [Export ("insertItemWithItemIdentifier:atIndex:")] - void InsertItem (string itemIdentifier, int index); + void InsertItem (string itemIdentifier, NSInteger index); [Export ("removeItemAtIndex:")] - void RemoveItem (int index); + void RemoveItem (NSInteger index); [Export ("runCustomizationPalette:")] void RunCustomizationPalette (NSObject sender); @@ -13377,6 +13480,7 @@ public interface NSToolbar { NSString NSToolbarPrintItemIdentifier { get; } } + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSToolbarDelegate { @@ -13405,7 +13509,7 @@ public interface NSToolbarDelegate { void DidRemoveItem (NSNotification notification); } - + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSToolbarItem { [Export ("initWithItemIdentifier:")] @@ -13437,7 +13541,7 @@ public interface NSToolbarItem { NSMenuItem MenuFormRepresentation { get; set; } [Export ("tag")] - int Tag { get; set; } + NSInteger Tag { get; set; } [Export ("target"), NullAllowed] NSObject Target { get; set; } @@ -13455,18 +13559,19 @@ public interface NSToolbarItem { NSView View { get; set; } [Export ("minSize")] - SizeF MinSize { get; set; } + NSSize MinSize { get; set; } [Export ("maxSize")] - SizeF MaxSize { get; set; } + NSSize MaxSize { get; set; } [Export ("visibilityPriority")] - int VisibilityPriority { get; set; } + NSInteger VisibilityPriority { get; set; } [Export ("autovalidates")] bool Autovalidates { get; set; } } + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTouch { [Export ("identity", ArgumentSemantic.Retain)] @@ -13476,7 +13581,7 @@ public interface NSTouch { NSTouchPhase Phase { get; } [Export ("normalizedPosition")] - PointF NormalizedPosition { get; } + NSPoint NormalizedPosition { get; } [Export ("isResting")] bool IsResting { get; } @@ -13485,16 +13590,17 @@ public interface NSTouch { NSObject Device { get; } [Export ("deviceSize")] - SizeF DeviceSize { get; } + NSSize DeviceSize { get; } } + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTrackingArea { [Export ("initWithRect:options:owner:userInfo:")] - IntPtr Constructor (RectangleF rect, NSTrackingAreaOptions options, NSObject owner, [NullAllowed] NSDictionary userInfo); - + IntPtr Constructor (NSRect rect, NSTrackingAreaOptions options, NSObject owner, [NullAllowed] NSDictionary userInfo); + [Export ("rect")] - RectangleF Rect { get; } + NSRect Rect { get; } [Export ("options")] NSTrackingAreaOptions Options { get; } @@ -13505,7 +13611,8 @@ public interface NSTrackingArea { [Export ("userInfo")] NSDictionary UserInfo { get; } } - + + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSTreeNode { [Static, Export ("treeNodeWithRepresentedObject:")] @@ -13540,6 +13647,7 @@ public interface NSTreeNode { } + // 64 bit reviewed [BaseType (typeof (NSObjectController))] public interface NSTreeController { [Export ("rearrangeObjects")] @@ -13655,35 +13763,36 @@ public interface NSTreeController { public partial interface NSTypesetter { } - + + //64 bit reviewed [BaseType (typeof (NSResponder), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSWindowDelegate)})] public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfaceItemIdentification { [Static, Export ("frameRectForContentRect:styleMask:")] - RectangleF FrameRectFor (RectangleF contectRect, NSWindowStyle styleMask); + NSRect FrameRectFor (NSRect contectRect, NSWindowStyle styleMask); [Static] [Export ("contentRectForFrameRect:styleMask:")] - RectangleF ContentRectFor (RectangleF forFrameRect, NSWindowStyle styleMask); + NSRect ContentRectFor (NSRect forFrameRect, NSWindowStyle styleMask); [Static] [Export ("minFrameWidthWithTitle:styleMask:")] - float MinFrameWidthWithTitle (string aTitle, NSWindowStyle aStyle); + CGFloat MinFrameWidthWithTitle (string aTitle, NSWindowStyle aStyle); [Static] [Export ("defaultDepthLimit")] NSWindowDepth DefaultDepthLimit { get; } [Export ("frameRectForContentRect:")] - RectangleF FrameRectFor (RectangleF contentRect); + NSRect FrameRectFor (NSRect contentRect); [Export ("contentRectForFrameRect:")] - RectangleF ContentRectFor (RectangleF frameRect); + NSRect ContentRectFor (NSRect frameRect); [Export ("initWithContentRect:styleMask:backing:defer:")] - IntPtr Constructor (RectangleF contentRect, NSWindowStyle aStyle, NSBackingStore bufferingType, bool deferCreation); + IntPtr Constructor (NSRect contentRect, NSWindowStyle aStyle, NSBackingStore bufferingType, bool deferCreation); [Export ("initWithContentRect:styleMask:backing:defer:screen:")] - IntPtr Constructor (RectangleF contentRect, NSWindowStyle aStyle, NSBackingStore bufferingType, bool deferCreation, NSScreen screen); + IntPtr Constructor (NSRect contentRect, NSWindowStyle aStyle, NSBackingStore bufferingType, bool deferCreation, NSScreen screen); [Export ("title")] string Title { get; set; } @@ -13713,7 +13822,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa NSWindowDelegate Delegate { get; set; } [Export ("windowNumber")] - int WindowNumber { get; } + NSInteger WindowNumber { get; } [Export ("styleMask")] NSWindowStyle StyleMask { get; set; } @@ -13725,31 +13834,31 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void EndEditingFor ([NullAllowed] NSObject anObject); [Export ("constrainFrameRect:toScreen:")] - RectangleF ConstrainFrameRect (RectangleF frameRect, NSScreen screen); + NSRect ConstrainFrameRect (NSRect frameRect, NSScreen screen); [Export ("setFrame:display:")] - void SetFrame (RectangleF frameRect, bool display); + void SetFrame (NSRect frameRect, bool display); [Export ("setContentSize:")] - void SetContentSize (SizeF aSize); + void SetContentSize (NSSize aSize); [Export ("setFrameOrigin:")] - void SetFrameOrigin (PointF aPoint); + void SetFrameOrigin (NSPoint aPoint); [Export ("setFrameTopLeftPoint:")] - void SetFrameTopLeftPoint (PointF aPoint); + void SetFrameTopLeftPoint (NSPoint aPoint); [Export ("cascadeTopLeftFromPoint:")] - PointF CascadeTopLeftFromPoint (PointF topLeftPoint); + NSPoint CascadeTopLeftFromPoint (NSPoint topLeftPoint); [Export ("frame")] - RectangleF Frame { get; } + NSRect Frame { get; } [Export ("animationResizeTime:")] - double AnimationResizeTime (RectangleF newFrame); + double AnimationResizeTime (NSRect newFrame); [Export ("setFrame:display:animate:")] - void SetFrame (RectangleF frameRect, bool display, bool animate); + void SetFrame (NSRect frameRect, bool display, bool animate); [Export ("inLiveResize")] bool InLiveResize { get; } @@ -13758,16 +13867,16 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa bool ShowsResizeIndicator { get; set; } [Export ("resizeIncrements")] - SizeF ResizeIncrements { get; set; } + NSSize ResizeIncrements { get; set; } [Export ("aspectRatio")] - SizeF AspectRatio { get; set; } + NSSize AspectRatio { get; set; } [Export ("contentResizeIncrements")] - SizeF ContentResizeIncrements { get; set; } + NSSize ContentResizeIncrements { get; set; } [Export ("contentAspectRatio")] - SizeF ContentAspectRatio { get; set; } + NSSize ContentAspectRatio { get; set; } [Export ("useOptimizedDrawing:")] void UseOptimizedDrawing (bool flag); @@ -13812,7 +13921,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa NSResponder FirstResponder { get; } [Export ("resizeFlags")] - int ResizeFlags { get; } + NSInteger ResizeFlags { get; } [Export ("keyDown:")] void KeyDown (NSEvent theEvent); @@ -13852,10 +13961,10 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa NSColor BackgroundColor { get; set; } [Export ("setContentBorderThickness:forEdge:")] - void SetContentBorderThickness (float thickness, NSRectEdge edge); + void SetContentBorderThickness (CGFloat thickness, NSRectEdge edge); [Export ("contentBorderThicknessForEdge:")] - float ContentBorderThicknessForEdge (NSRectEdge edge); + CGFloat ContentBorderThicknessForEdge (NSRectEdge edge); [Export ("setAutorecalculatesContentBorderThickness:forEdge:")] void SetAutorecalculatesContentBorderThickness (bool flag, NSRectEdge forEdge); @@ -13891,7 +14000,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void OrderOut ([NullAllowed] NSObject sender); [Export ("orderWindow:relativeTo:")] - void OrderWindow (NSWindowOrderingMode place, int relativeTo); + void OrderWindow (NSWindowOrderingMode place, NSInteger relativeTo); [Export ("orderFrontRegardless")] void OrderFrontRegardless (); @@ -13948,10 +14057,10 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa bool PreventsApplicationTerminationWhenModal { get; set; } [Export ("convertBaseToScreen:")] - PointF ConvertBaseToScreen (PointF aPoint); + NSPoint ConvertBaseToScreen (NSPoint aPoint); [Export ("convertScreenToBase:")] - PointF ConvertScreenToBase (PointF aPoint); + NSPoint ConvertScreenToBase (NSPoint aPoint); [Export ("performClose:")] void PerformClose (NSObject sender); @@ -13963,7 +14072,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void PerformZoom (NSObject sender); [Export ("gState")] - int GState (); + NSInteger GState(); [Export ("setOneShot:")] void SetOneShot (bool flag); @@ -13972,11 +14081,11 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa bool IsOneShot { get; } [Export ("dataWithEPSInsideRect:")] - NSData DataWithEpsInsideRect (RectangleF rect); + NSData DataWithEpsInsideRect (NSRect rect); [Export ("dataWithPDFInsideRect:")] - NSData DataWithPdfInsideRect (RectangleF rect); - + NSData DataWithPdfInsideRect (NSRect rect); + [Export ("print:")] void Print (NSObject sender); @@ -14029,7 +14138,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void InvalidateShadow (); [Export ("alphaValue")] - float AlphaValue { get; set; } + CGFloat AlphaValue { get; set; } [Export ("opaque")] bool IsOpaque { [Bind ("isOpaque")]get; set; } @@ -14087,7 +14196,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void RemoveFrameUsingName (string name); [Export ("cacheImageInRect:")] - void CacheImageInRect (RectangleF aRect); + void CacheImageInRect (NSRect aRect); [Export ("restoreCachedImage")] void RestoreCachedImage (); @@ -14096,25 +14205,25 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void DiscardCachedImage (); [Export ("minSize")] - SizeF MinSize { get; set; } + NSSize MinSize { get; set; } [Export ("maxSize")] - SizeF MaxSize { get; set; } + NSSize MaxSize { get; set; } [Export ("contentMinSize")] - SizeF ContentMinSize { get; set; } + NSSize ContentMinSize { get; set; } [Export ("contentMaxSize")] - SizeF ContentMaxSize { get; set; } + NSSize ContentMaxSize { get; set; } [Export ("nextEventMatchingMask:"), Protected] - NSEvent NextEventMatchingMask (uint mask); + NSEvent NextEventMatchingMask (NSUInteger mask); [Export ("nextEventMatchingMask:untilDate:inMode:dequeue:"), Protected] - NSEvent NextEventMatchingMask (uint mask, NSDate expiration, string mode, bool deqFlag); + NSEvent NextEventMatchingMask (NSUInteger mask, NSDate expiration, string mode, bool deqFlag); [Export ("discardEventsMatchingMask:beforeEvent:"), Protected] - void DiscardEventsMatchingMask (uint mask, NSEvent beforeLastEvent); + void DiscardEventsMatchingMask (NSUInteger mask, NSEvent beforeLastEvent); [Export ("postEvent:atStart:")] void PostEvent (NSEvent theEvent, bool atStart); @@ -14135,7 +14244,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void SendEvent (NSEvent theEvent); [Export ("mouseLocationOutsideOfEventStream")] - PointF MouseLocationOutsideOfEventStream { get; } + NSPoint MouseLocationOutsideOfEventStream { get; } [Static] [Export ("menuChanged:")] @@ -14173,7 +14282,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa NSGraphicsContext GraphicsContext { get; } [Export ("userSpaceScaleFactor")] - float UserSpaceScaleFactor { get; } + CGFloat UserSpaceScaleFactor { get; } [Export ("colorSpace")] NSColorSpace ColorSpace { get; set; } @@ -14184,7 +14293,7 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa [Static] [Export ("windowNumberAtPoint:belowWindowWithWindowNumber:")] - int WindowNumberAtPoint (PointF point, int windowNumber); + NSInteger WindowNumberAtPoint (NSPoint point, NSInteger windowNumber); [Export ("initialFirstResponder")] NSView InitialFirstResponder { get; set; } @@ -14266,22 +14375,22 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa void VisualizeConstraints (NSLayoutConstraint [] constraints); [Lion, Export ("convertRectToScreen:")] - RectangleF ConvertRectToScreen (RectangleF aRect); + NSRect ConvertRectToScreen (NSRect aRect); [Lion, Export ("convertRectFromScreen:")] - RectangleF ConvertRectFromScreen (RectangleF aRect); + NSRect ConvertRectFromScreen (NSRect aRect); [Lion, Export ("convertRectToBacking:")] - RectangleF ConvertRectToBacking (RectangleF aRect); + NSRect ConvertRectToBacking (NSRect aRect); [Lion, Export ("convertRectFromBacking:")] - RectangleF ConvertRectFromBacking (RectangleF aRect); + NSRect ConvertRectFromBacking (NSRect aRect); [Lion, Export ("backingAlignedRect:options:")] - RectangleF BackingAlignedRect (RectangleF aRect, NSAlignmentOptions options); + NSRect BackingAlignedRect (NSRect aRect, NSAlignmentOptions options); [Lion, Export ("backingScaleFactor")] - float BackingScaleFactor { get; } + CGFloat BackingScaleFactor { get; } [Lion, Export ("toggleFullScreen:")] void ToggleFullScreen (NSObject sender); @@ -14378,7 +14487,8 @@ public partial interface NSWindow : NSAnimatablePropertyContainer, NSUserInterfa } public delegate void NSWindowCompletionHandler (NSWindow window, NSError error); - + + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] [Lion] @@ -14389,6 +14499,7 @@ public partial interface NSWindowRestoration { } + //64 bit reviewed [BaseType (typeof (NSResponder))] public interface NSWindowController { [Export ("initWithWindow:")] @@ -14461,27 +14572,29 @@ public interface NSWindowDelegate { [Export ("windowWillReturnFieldEditor:toObject:"), DelegateName ("NSWindowClient"), DefaultValue (null)] NSObject WillReturnFieldEditor (NSWindow sender, NSObject client); - [Export ("windowWillResize:toSize:"), DelegateName ("NSWindowResize"), DefaultValueFromArgument ("toFrameSize")] - SizeF WillResize (NSWindow sender, SizeF toFrameSize); + // 25 April 2013, S. Baer + //?? The following delegate function does not work in the 64bit build and I haven't figured out why yet + //[Export ("windowWillResize:toSize:"), DelegateName ("NSWindowResize"), DefaultValueFromArgument ("toFrameSize")] + //NSSize WillResize (NSWindow sender, NSSize toFrameSize); [Export ("windowWillUseStandardFrame:defaultFrame:"), DelegateName ("NSWindowFrame"), DefaultValueFromArgument ("newFrame")] - RectangleF WillUseStandardFrame (NSWindow window, RectangleF newFrame); + NSRect WillUseStandardFrame (NSWindow window, NSRect newFrame); [Export ("windowShouldZoom:toFrame:"), DelegateName ("NSWindowFramePredicate"), DefaultValue (true)] - bool ShouldZoom (NSWindow window, RectangleF newFrame); - + bool ShouldZoom (NSWindow window, NSRect newFrame); + [Export ("windowWillReturnUndoManager:"), DelegateName ("NSWindowUndoManager"), DefaultValue (null)] NSUndoManager WillReturnUndoManager (NSWindow window); [Export ("window:willPositionSheet:usingRect:"), DelegateName ("NSWindowSheetRect"), DefaultValueFromArgument ("usingRect")] - RectangleF WillPositionSheet (NSWindow window, NSWindow sheet, RectangleF usingRect); - + NSRect WillPositionSheet (NSWindow window, NSWindow sheet, NSRect usingRect); + [Export ("window:shouldPopUpDocumentPathMenu:"), DelegateName ("NSWindowMenu"), DefaultValue (true)] bool ShouldPopUpDocumentPathMenu (NSWindow window, NSMenu menu); [Export ("window:shouldDragDocumentWithEvent:from:withPasteboard:"), DelegateName ("NSWindowDocumentDrag"), DefaultValue (true)] - bool ShouldDragDocumentWithEvent (NSWindow window, NSEvent theEvent, PointF dragImageLocation, NSPasteboard withPasteboard); - + bool ShouldDragDocumentWithEvent (NSWindow window, NSEvent theEvent, NSPoint dragImageLocation, NSPasteboard withPasteboard); + [Export ("windowDidResize:"), EventArgs ("NSNotification")] void DidResize (NSNotification notification); @@ -14558,8 +14671,8 @@ public interface NSWindowDelegate { void DidFailToExitFullScreen (NSWindow window); [Lion, Export ("window:willUseFullScreenContentSize:"), DelegateName ("NSWindowSize"), DefaultValueFromArgument ("proposedSize")] - SizeF WillUseFullScreenContentSize (NSWindow window, SizeF proposedSize); - + NSSize WillUseFullScreenContentSize (NSWindow window, NSSize proposedSize); + [Lion, Export ("window:willUseFullScreenPresentationOptions:"), DelegateName ("NSWindowApplicationPresentationOptions"), DefaultValueFromArgument ("proposedOptions")] NSApplicationPresentationOptions WillUseFullScreenPresentationOptions (NSWindow window, NSApplicationPresentationOptions proposedOptions); @@ -14582,8 +14695,8 @@ public interface NSWindowDelegate { void DidDecodeRestorableState(NSWindow window, NSCoder coder); [Lion, Export ("window:willResizeForVersionBrowserWithMaxPreferredSize:maxAllowedSize:"), DelegateName ("NSWindowSizeSize"), DefaultValueFromArgument ("maxPreferredSize")] - SizeF WillResizeForVersionBrowser(NSWindow window, SizeF maxPreferredSize, SizeF maxAllowedSize); - + NSSize WillResizeForVersionBrowser(NSWindow window, NSSize maxPreferredSize, NSSize maxAllowedSize); + [Lion, Export ("windowWillEnterVersionBrowser:"), EventArgs ("NSNotification")] void WillEnterVersionBrowser (NSNotification notification); @@ -14631,7 +14744,8 @@ interface NSWorkspaceFileOperationEventArgs { } public delegate void NSWorkspaceUrlHandler (NSDictionary newUrls, NSError error); - + + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSWorkspace { [Static] @@ -14651,8 +14765,8 @@ public interface NSWorkspace { bool OpenFile (string fullPath, string appName, bool deactivate); [Export ("openFile:fromImage:at:inView:")] - bool OpenFile (string fullPath, NSImage anImage, PointF point, NSView aView); - + bool OpenFile (string fullPath, NSImage anImage, NSPoint point, NSView aView); + [Export ("openURL:")] bool OpenUrl (NSUrl url); @@ -14714,8 +14828,8 @@ public interface NSWorkspace { bool GetFileSystemInfo (string fullPath, out bool removableFlag, out bool writableFlag, out bool unmountableFlag, out string description, out string fileSystemType); [Export ("performFileOperation:source:destination:files:tag:")] - bool PerformFileOperation (NSString workspaceOperation, string source, string destination, string[] files, out int tag); - + bool PerformFileOperation (NSString workspaceOperation, string source, string destination, string[] files, out NSInteger tag); + [Export ("unmountAndEjectDeviceAtPath:")] bool UnmountAndEjectDevice(string path); @@ -14723,8 +14837,8 @@ public interface NSWorkspace { bool UnmountAndEjectDevice (NSUrl url, out NSError error); [Export ("extendPowerOffBy:")] - int ExtendPowerOffBy (int requested); - + NSInteger ExtendPowerOffBy (NSInteger requested); + [Export ("hideOtherApplications")] void HideOtherApplications (); @@ -14898,7 +15012,7 @@ public interface NSWorkspace { NSString OperationDestroy { get; } } - + //64 bit reviewed [BaseType (typeof (NSObject))] public partial interface NSRunningApplication { [Export ("terminated")] @@ -14959,7 +15073,7 @@ public partial interface NSRunningApplication { [Static] [Export ("runningApplicationsWithBundleIdentifier:")] NSRunningApplication[] GetRunningApplications (string bundleIdentifier); - + [Static] [Export ("runningApplicationWithProcessIdentifier:")] NSRunningApplication GetRunningApplication (int pid); @@ -14970,10 +15084,11 @@ public partial interface NSRunningApplication { } + //64 bit reviewed [BaseType (typeof (NSControl))] public interface NSStepper { [Export ("initWithFrame:")] - IntPtr Constructor (RectangleF frameRect); + IntPtr Constructor (NSRect frameRect); //Detected properties [Export ("minValue")] @@ -14992,7 +15107,8 @@ public interface NSStepper { bool Autorepeat { get; set; } } - + + //64 bit reviewed [BaseType (typeof (NSObject))] public interface NSPredicateEditorRowTemplate { [Export ("matchForPredicate:")] @@ -15049,6 +15165,7 @@ public interface NSPredicateEditorRowTemplate { } + //64 bit reviewed [BaseType (typeof (NSControl), Delegates=new string [] { "Delegate" }, Events=new Type [] { typeof (NSRuleEditorDelegate)})] public interface NSRuleEditor { [Export ("reloadCriteria")] @@ -15061,40 +15178,40 @@ public interface NSRuleEditor { void ReloadPredicate (); [Export ("predicateForRow:")] - NSPredicate GetPredicate (int row); + NSPredicate GetPredicate (NSInteger row); [Export ("numberOfRows")] - int NumberOfRows { get; } + NSInteger NumberOfRows { get; } [Export ("subrowIndexesForRow:")] - NSIndexSet SubrowIndexes (int rowIndex); + NSIndexSet SubrowIndexes (NSInteger rowIndex); [Export ("criteriaForRow:")] - NSArray Criteria (int row); + NSArray Criteria (NSInteger row); [Export ("displayValuesForRow:")] - NSObject[] DisplayValues (int row); + NSObject[] DisplayValues (NSInteger row); [Export ("rowForDisplayValue:")] - int Row (NSObject displayValue); + NSInteger Row (NSObject displayValue); [Export ("rowTypeForRow:")] - NSRuleEditorRowType RowType (int rowIndex); + NSRuleEditorRowType RowType (NSInteger rowIndex); [Export ("parentRowForRow:")] - int ParentRow (int rowIndex); + NSInteger ParentRow (NSInteger rowIndex); [Export ("addRow:")] void AddRow (NSObject sender); [Export ("insertRowAtIndex:withType:asSubrowOfRow:animate:")] - void InsertRowAtIndex (int rowIndex, NSRuleEditorRowType rowType, int parentRow, bool shouldAnimate); + void InsertRowAtIndex (NSInteger rowIndex, NSRuleEditorRowType rowType, NSInteger parentRow, bool shouldAnimate); [Export ("setCriteria:andDisplayValues:forRowAtIndex:")] - void SetCriteria (NSArray criteria, NSArray values, int rowIndex); + void SetCriteria (NSArray criteria, NSArray values, NSInteger rowIndex); [Export ("removeRowAtIndex:")] - void RemoveRowAtIndex (int rowIndex); + void RemoveRowAtIndex (NSInteger rowIndex); [Export ("removeRowsAtIndexes:includeSubrows:")] void RemoveRowsAtIndexes (NSIndexSet rowIndexes, bool includeSubrows); @@ -15124,7 +15241,7 @@ public interface NSRuleEditor { NSRuleEditorNestingMode NestingMode { get; set; } [Export ("rowHeight")] - float RowHeight { get; set; } + CGFloat RowHeight { get; set; } [Export ("editable")] bool Editable { [Bind ("isEditable")]get; set; } @@ -15148,24 +15265,25 @@ public interface NSRuleEditor { string DisplayValuesKeyPath { get; set; } } + //64 bit reviewed [BaseType (typeof (NSObject))] [Model] public interface NSRuleEditorDelegate { [Abstract] [Export ("ruleEditor:numberOfChildrenForCriterion:withRowType:"), DelegateName ("NSRuleEditorNumberOfChildren"), DefaultValue(0)] - int NumberOfChildren (NSRuleEditor editor, NSObject criterion, NSRuleEditorRowType rowType); + NSInteger NumberOfChildren (NSRuleEditor editor, NSObject criterion, NSRuleEditorRowType rowType); [Abstract] [Export ("ruleEditor:child:forCriterion:withRowType:"), DelegateName ("NSRulerEditorChildCriterion"), DefaultValue(null)] - NSObject ChildForCriterion (NSRuleEditor editor, int index, NSObject criterion, NSRuleEditorRowType rowType); + NSObject ChildForCriterion (NSRuleEditor editor, NSInteger index, NSObject criterion, NSRuleEditorRowType rowType); [Abstract] [Export ("ruleEditor:displayValueForCriterion:inRow:"), DelegateName ("NSRulerEditorDisplayValue"), DefaultValue(null)] - NSObject DisplayValue (NSRuleEditor editor, NSObject criterion, int row); + NSObject DisplayValue (NSRuleEditor editor, NSObject criterion, NSInteger row); [Abstract] [Export ("ruleEditor:predicatePartsForCriterion:withDisplayValue:inRow:"), DelegateName ("NSRulerEditorPredicateParts"), DefaultValue(null)] - NSDictionary PredicateParts (NSRuleEditor editor, NSObject criterion, NSObject value, int row); + NSDictionary PredicateParts (NSRuleEditor editor, NSObject criterion, NSObject value, NSInteger row); [Abstract] [Export ("ruleEditorRowsDidChange:"), EventArgs ("NSNotification")] @@ -15182,6 +15300,7 @@ public interface NSRuleEditorDelegate { } + //64 bit reviewed [BaseType (typeof (NSRuleEditor))] public interface NSPredicateEditor { //Detected properties @@ -15194,7 +15313,8 @@ public interface NSPredicateEditor { [MountainLion] public delegate void NSSharingServiceHandler (); - + + //64 bit reviewed [MountainLion] [BaseType (typeof (NSObject), Delegates=new string [] {"WeakDelegate"}, @@ -15279,7 +15399,8 @@ public interface NSSharingService [Field ("NSSharingServiceNamePostVideoOnTudou")][Internal] NSString NSSharingServiceNamePostVideoOnTudou { get; } } - + + //64 bit reviewed [MountainLion] [BaseType (typeof (NSObject))] [Model] @@ -15295,11 +15416,11 @@ public interface NSSharingServiceDelegate void DidShareItems (NSSharingService sharingService, NSObject [] items); [Export ("sharingService:sourceFrameOnScreenForShareItem:"), DelegateName ("NSSharingServiceSourceFrameOnScreenForShareItem"), DefaultValue (null)] - RectangleF SourceFrameOnScreenForShareItem (NSSharingService sharingService, NSPasteboardWriting item); - + NSRect SourceFrameOnScreenForShareItem (NSSharingService sharingService, NSPasteboardWriting item); + [Export ("sharingService:transitionImageForShareItem:contentRect:"), DelegateName ("NSSharingServiceTransitionImageForShareItem"), DefaultValue (null)] - NSImage TransitionImageForShareItem (NSSharingService sharingService, NSPasteboardWriting item, RectangleF contentRect); - + NSImage TransitionImageForShareItem (NSSharingService sharingService, NSPasteboardWriting item, NSRect contentRect); + [Export ("sharingService:sourceWindowForShareItems:sharingContentScope:"), DelegateName ("NSSharingServiceSourceWindowForShareItems"), DefaultValue (null)] NSWindow SourceWindowForShareItems (NSSharingService sharingService, NSObject [] items, NSSharingContentScope sharingContentScope); } @@ -15320,9 +15441,10 @@ public interface NSSharingServicePicker IntPtr Constructor (NSObject [] items); [Export ("showRelativeToRect:ofView:preferredEdge:")] - void ShowRelativeToRect (RectangleF rect, NSView view, NSRectEdge preferredEdge); + void ShowRelativeToRect (NSRect rect, NSView view, NSRectEdge preferredEdge); } - + + // 64bit reviewed [MountainLion] [BaseType (typeof (NSObject))] [Model] diff --git a/src/core.sln b/src/core.sln new file mode 100644 index 000000000..ba60de8fe --- /dev/null +++ b/src/core.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB9-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.dll", "{2387D73E-179C-4B11-B154-0B1695684794}" + ProjectSection(MonoDevelopProperties) = preProject + BaseDirectory = ..\.. + name = core + Configurations = $0 + $0.Configuration = $1 + $1.name = Default + $1.OutputPath = .\ + $1.ctype = ProjectConfiguration + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Default|Any CPU = Default|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2387D73E-179C-4B11-B154-0B1695684794}.Default|Any CPU.ActiveCfg = Default|Any CPU + {2387D73E-179C-4B11-B154-0B1695684794}.Default|Any CPU.Build.0 = Default|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = core.dll + EndGlobalSection +EndGlobal diff --git a/src/core.userprefs b/src/core.userprefs new file mode 100644 index 000000000..5d6d14d97 --- /dev/null +++ b/src/core.userprefs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file