Mercurial > projects > dwt-mac
changeset 48:34237ae5156a
Updated Scrollable to 3.514
author | Jacob Carlborg <doob@me.com> |
---|---|
date | Sun, 07 Dec 2008 20:16:52 +0100 |
parents | 8615c76f10e4 |
children | 9dd4a17513f9 |
files | dwt/internal/cocoa/NSRect.d dwt/internal/cocoa/OS.d dwt/widgets/ScrollBar.d dwt/widgets/Scrollable.d |
diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/dwt/internal/cocoa/NSRect.d Fri Dec 05 16:23:23 2008 +0100 +++ b/dwt/internal/cocoa/NSRect.d Sun Dec 07 20:16:52 2008 +0100 @@ -56,7 +56,7 @@ return size.height; } - CGFloat width (CGFloat height) + CGFloat height (CGFloat height) { return size.height = height; }
--- a/dwt/internal/cocoa/OS.d Fri Dec 05 16:23:23 2008 +0100 +++ b/dwt/internal/cocoa/OS.d Sun Dec 07 20:16:52 2008 +0100 @@ -33,6 +33,7 @@ import dwt.internal.cocoa.NSSize; import dwt.internal.cocoa.NSString; import dwt.internal.cocoa.NSText; +import dwt.internal.cocoa.NSView; import Cocoa = dwt.internal.objc.cocoa.Cocoa; import objc = dwt.internal.objc.runtime; @@ -2599,7 +2600,7 @@ public static const int NSBelowBottom = 6; public static const int NSBelowTop = 3; public static const int NSBevelLineJoinStyle = 2; -public static const int NSBezelBorder = 2; +alias NSBorderType.NSBezelBorder NSBezelBorder; public static const int NSBlueControlTint = 1; public static const int NSBoldFontMask = 2; public static const int NSBorderlessWindowMask = 0; @@ -3011,7 +3012,7 @@ public static const int NSNewlineCharacter = 10; public static const int NSNextFunctionKey = 63296; public static const int NSNextStepInterfaceStyle = 1; -public static const int NSNoBorder = 0; +alias NSBorderType.NSNoBorder NSNoBorder; public static const int NSNoCellMask = 0; public static const int NSNoFontChangeAction = 0; public static const int NSNoImage = 0;
--- a/dwt/widgets/ScrollBar.d Fri Dec 05 16:23:23 2008 +0100 +++ b/dwt/widgets/ScrollBar.d Sun Dec 07 20:16:52 2008 +0100 @@ -103,7 +103,7 @@ int increment = 1; int pageIncrement = 10; id target; - String actionSelector;; + objc.SEL actionSelector; this () { /* Do nothing */
--- a/dwt/widgets/Scrollable.d Fri Dec 05 16:23:23 2008 +0100 +++ b/dwt/widgets/Scrollable.d Sun Dec 07 20:16:52 2008 +0100 @@ -128,7 +128,7 @@ NSSize size = NSSize(); size.width = width; size.height = height; - NSBorderType border = hasBorder() ? NSBezelBorder : NSNoBorder; + NSBorderType border = hasBorder() ? OS.NSBezelBorder : OS.NSNoBorder; size = NSScrollView.frameSizeForContentSize(size, (style & DWT.H_SCROLL) !is 0, (style & DWT.V_SCROLL) !is 0, border); width = cast(int)size.width; height = cast(int)size.height; @@ -146,14 +146,14 @@ bar.style = style; bar.display = display; NSScroller scroller; - String actionSelector; + objc.SEL actionSelector; NSRect rect = NSRect(); if ((style & DWT.H_SCROLL) !is 0) { rect.width = 1; } else { rect.height = 1; } - scroller = (NSScroller)new SWTScroller().alloc(); + scroller = cast(NSScroller)(new SWTScroller()).alloc(); scroller.initWithFrame(rect); if ((style & DWT.H_SCROLL) !is 0) { scrollView.setHorizontalScroller(scroller);