Mercurial > projects > dwt-mac

changeset 57:4444d15131d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated ScrollBar to 3.514
author Jacob Carlborg <doob@me.com>
date Mon, 08 Dec 2008 22:02:10 +0100
parents a470e49a1890
children 6d9ec9ccdcdd
files dwt/internal/cocoa/NSScroller.d dwt/internal/cocoa/OS.d dwt/widgets/MenuItem.d dwt/widgets/ScrollBar.d
diffstat 4 files changed, 25 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/internal/cocoa/NSScroller.d	Mon Dec 08 21:51:26 2008 +0100
+++ b/dwt/internal/cocoa/NSScroller.d	Mon Dec 08 22:02:10 2008 +0100
@@ -20,7 +20,7 @@
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-enum NSScrollerPar
+enum NSScrollerPart
 {
     NSScrollerNoPart = 0,
     NSScrollerDecrementPage = 1,
@@ -45,8 +45,8 @@
     super(id);
 }
 
-public NSScrollerPar hitPart() {
-    return cast(NSScrollerPar) OS.objc_msgSend(this.id, OS.sel_hitPart);
+public NSScrollerPart hitPart() {
+    return cast(NSScrollerPart) OS.objc_msgSend(this.id, OS.sel_hitPart);
 }
 
 public static CGFloat scrollerWidth() {
--- a/dwt/internal/cocoa/OS.d	Mon Dec 08 21:51:26 2008 +0100
+++ b/dwt/internal/cocoa/OS.d	Mon Dec 08 22:02:10 2008 +0100
@@ -33,6 +33,8 @@
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRange;
 import dwt.internal.cocoa.NSRect;
+import dwt.internal.cocoa.NSScrollView;
+import dwt.internal.cocoa.NSScroller;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.NSText;
@@ -3208,12 +3210,12 @@
 public static const int NSScrollerArrowsMinEnd = 1;
 public static const int NSScrollerArrowsNone = 2;
 public static const int NSScrollerDecrementArrow = 1;
-public static const int NSScrollerDecrementLine = 4;
-public static const int NSScrollerDecrementPage = 1;
+alias NSScrollerPart.NSScrollerDecrementLine NSScrollerDecrementLine;
+alias NSScrollerPart.NSScrollerDecrementPage NSScrollerDecrementPage;
 public static const int NSScrollerIncrementArrow = 0;
-public static const int NSScrollerIncrementLine = 5;
-public static const int NSScrollerIncrementPage = 3;
-public static const int NSScrollerKnob = 2;
+alias NSScrollerPart.NSScrollerIncrementLine NSScrollerIncrementLine;
+alias NSScrollerPart.NSScrollerIncrementPage NSScrollerIncrementPage;
+alias NSScrollerPart.NSScrollerKnob NSScrollerKnob;
 public static const int NSScrollerKnobSlot = 6;
 public static const int NSScrollerNoPart = 0;
 public static const int NSSearchFieldClearRecentsMenuItemTag = 1002;
--- a/dwt/widgets/MenuItem.d	Mon Dec 08 21:51:26 2008 +0100
+++ b/dwt/widgets/MenuItem.d	Mon Dec 08 22:02:10 2008 +0100
@@ -30,7 +30,7 @@
 import dwt.internal.cocoa.SWTMenu;
 
 import dwt.dwthelper.utils;
-import dwt.internal.cocoa.NSInteger;
+import dwt.internal.objc.cocoa.Cocoa;
 import dwt.widgets.Decorations;
 import dwt.widgets.Display;
 import dwt.widgets.Event;
@@ -415,6 +415,8 @@
         * The following lines are intentionally commented.
         */
 //      case DWT.INSERT: return ??;
+        default:
+            assert(false);
     }
     return 0;
 }
@@ -836,7 +838,7 @@
                     break;
             }
         }
-        NSString string = NSString.stringWith (key is 0 ? "" : (char)key + "");
+        NSString string = NSString.stringWith (key is 0 ? "" : cast(char)key ~ "");
         nsItem.setKeyEquivalentModifierMask (mask);
         nsItem.setKeyEquivalent (string.lowercaseString ());
         //TODO - only hide when key !is 0 (fix all places)
--- a/dwt/widgets/ScrollBar.d	Mon Dec 08 21:51:26 2008 +0100
+++ b/dwt/widgets/ScrollBar.d	Mon Dec 08 22:02:10 2008 +0100
@@ -25,7 +25,8 @@
 import dwt.internal.cocoa.id;
 
 import dwt.dwthelper.utils;
-import dwt.internal.cocoa.CGFloat;
+import dwt.internal.c.Carbon;
+import dwt.internal.cocoa.NSScroller;
 import dwt.widgets.Event;
 import dwt.widgets.Scrollable;
 import dwt.widgets.TypedListener;
@@ -289,8 +290,8 @@
  */
 public Point getSize () {
     checkWidget();
-    NSRect rect = ((NSScroller)view).frame();
-    return new Point((int)rect.width, (int)rect.height);
+    NSRect rect = (cast(NSScroller)view).frame();
+    return new Point(cast(int)rect.width, cast(int)rect.height);
 }
 
 /**
@@ -429,25 +430,27 @@
     Event event = new Event();
     NSScrollerPart hitPart = (cast(NSScroller)view).hitPart();
     switch (hitPart) {
-        case NSScrollerDecrementLine:
+        case OS.NSScrollerDecrementLine:
             value -= increment;
             event.detail = DWT.ARROW_UP;
             break;
-        case NSScrollerDecrementPage:
+        case OS.NSScrollerDecrementPage:
             value -= pageIncrement;
             event.detail = DWT.PAGE_UP;
             break;
-        case NSScrollerIncrementLine:
+        case OS.NSScrollerIncrementLine:
             value += increment;
             event.detail = DWT.PAGE_DOWN;
             break;
-        case NSScrollerIncrementPage:
+        case OS.NSScrollerIncrementPage:
             value += pageIncrement;
             event.detail = DWT.ARROW_DOWN;
             break;
-        case NSScrollerKnob:
+        case OS.NSScrollerKnob:
             event.detail = DWT.DRAG;
             break;
+        default:
+            assert(false);
     }
     if (target is null) {
         if (event.detail !is DWT.DRAG) {