--- a/dwt/internal/cocoa/NSScrollView.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSScrollView.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,336 +1,110 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2008 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *    Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.NSScrollView;
 
-import dwt.internal.cocoa.id;
-import dwt.internal.cocoa.CGFloat;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSClipView;
-import dwt.internal.cocoa.NSColor;
-import dwt.internal.cocoa.NSCursor;
-import dwt.internal.cocoa.NSEvent;
 import dwt.internal.cocoa.NSRect;
-import dwt.internal.cocoa.NSRulerView;
 import dwt.internal.cocoa.NSScroller;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-public class NSScrollView : NSView
-{
-
-    public this ()
-    {
-        super();
-    }
-
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public bool autohidesScrollers ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_autohidesScrollers) !is null;
-    }
+public class NSScrollView : NSView {
 
-    public NSColor backgroundColor ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_backgroundColor);
-        return result !is null ? new NSColor(result) : null;
-    }
+public this() {
+    super();
+}
 
-    public NSBorderType borderType ()
-    {
-        return cast(NSBorderType) OS.objc_msgSend(this.id_, OS.sel_borderType);
-    }
-
-    public NSSize contentSize ()
-    {
-        NSSize result;
-        OS.objc_msgSend_struct(&result, this.id_, OS.sel_contentSize);
-        return result;
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public static NSSize contentSizeForFrameSize (NSSize fSize, bool hFlag, bool vFlag, NSBorderType aType)
-    {
-        NSSize result;
-        OS.objc_msgSend_stret(&result, OS.class_NSScrollView,
-                OS.sel_contentSizeForFrameSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1, fSize, hFlag, vFlag, aType);
-        return result;
-    }
-
-    public NSClipView contentView ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_contentView);
-        return result !is null ? new NSClipView(result) : null;
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public NSCursor documentCursor ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_documentCursor);
-        return result !is null ? new NSCursor(result) : null;
-    }
-
-    public id documentView ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_documentView);
-        return result !is null ? new id(result) : null;
-    }
-
-    public NSRect documentVisibleRect ()
-    {
-        NSRect result;
-        OS.objc_msgSend_stret(&result, this.id_, OS.sel_documentVisibleRect);
-        return result;
-    }
-
-    public bool drawsBackground ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_drawsBackground) !is null;
-    }
+public NSSize contentSize() {
+    NSSize result = NSSize();
+    OS.objc_msgSend_stret(result, this.id, OS.sel_contentSize);
+    return result;
+}
 
-    public static NSSize frameSizeForContentSize (NSSize cSize, bool hFlag, bool vFlag, NSBorderType aType)
-    {
-        NSSize result;
-        OS.objc_msgSend_struct(&result, OS.class_NSScrollView,
-                OS.sel_frameSizeForContentSize_1hasHorizontalScroller_1hasVerticalScroller_1borderType_1, &cSize, hFlag, vFlag, aType);
-        return result;
-    }
-
-    public bool hasHorizontalRuler ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_hasHorizontalRuler) !is null;
-    }
+public static NSSize contentSizeForFrameSize(NSSize fSize, bool hFlag, bool vFlag, NSBorderType aType) {
+    NSSize result = NSSize();
+    OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_contentSizeForFrameSize_hasHorizontalScroller_hasVerticalScroller_borderType_, fSize, hFlag, vFlag, aType);
+    return result;
+}
 
-    public bool hasHorizontalScroller ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_hasHorizontalScroller) !is null;
-    }
-
-    public bool hasVerticalRuler ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_hasVerticalRuler) !is null;
-    }
-
-    public bool hasVerticalScroller ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_hasVerticalScroller) !is null;
-    }
-
-    public CGFloat horizontalLineScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_horizontalLineScroll);
-    }
+public NSClipView contentView() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_contentView);
+    return result !is null ? new NSClipView(result) : null;
+}
 
-    public CGFloat horizontalPageScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_horizontalPageScroll);
-    }
-
-    public NSRulerView horizontalRulerView ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_horizontalRulerView);
-        return result !is null ? new NSRulerView(result) : null;
-    }
-
-    public NSScroller horizontalScroller ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_horizontalScroller);
-        return result !is null ? new NSScroller(result) : null;
-    }
+public NSView documentView() {
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_documentView);
+    return result !is null ? new NSView(result) : null;
+}
 
-    public CGFloat lineScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_lineScroll);
-    }
-
-    public CGFloat pageScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_pageScroll);
-    }
-
-    public void reflectScrolledClipView (NSClipView cView)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_reflectScrolledClipView_1, cView !is null ? cView.id_ : null);
-    }
-
-    public static objc.Class rulerViewClass ()
-    {
-        return cast(objc.Class) OS.objc_msgSend(OS.class_NSScrollView, OS.sel_rulerViewClass);
-    }
-
-    public bool rulersVisible ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_rulersVisible) !is null;
-    }
+public NSRect documentVisibleRect() {
+    NSRect result = NSRect();
+    OS.objc_msgSend_stret(result, this.id, OS.sel_documentVisibleRect);
+    return result;
+}
 
-    public void scrollWheel (NSEvent theEvent)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_scrollWheel_1, theEvent !is null ? theEvent.id_ : null);
-    }
-
-    public bool scrollsDynamically ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_scrollsDynamically) !is null;
-    }
-
-    public void setAutohidesScrollers (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setAutohidesScrollers_1, flag);
-    }
-
-    public void setBackgroundColor (NSColor color)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setBackgroundColor_1, color !is null ? color.id_ : null);
-    }
-
-    public void setBorderType (NSBorderType aType)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setBorderType_1, aType);
-    }
-
-    public void setContentView (NSClipView contentView)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setContentView_1, contentView !is null ? contentView.id_ : null);
-    }
-
-    public void setDocumentCursor (NSCursor anObj)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setDocumentCursor_1, anObj !is null ? anObj.id_ : null);
-    }
+public static NSSize frameSizeForContentSize(NSSize cSize, bool hFlag, bool vFlag, NSBorderType aType) {
+    NSSize result = NSSize();
+    OS.objc_msgSend_stret(result, OS.class_NSScrollView, OS.sel_frameSizeForContentSize_hasHorizontalScroller_hasVerticalScroller_borderType_, cSize, hFlag, vFlag, aType);
+    return result;
+}
 
-    public void setDocumentView (NSView aView)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setDocumentView_1, aView !is null ? aView.id_ : null);
-    }
-
-    public void setDrawsBackground (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setDrawsBackground_1, flag);
-    }
-
-    public void setHasHorizontalRuler (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHasHorizontalRuler_1, flag);
-    }
-
-    public void setHasHorizontalScroller (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHasHorizontalScroller_1, flag);
-    }
+public void reflectScrolledClipView(NSClipView cView) {
+    OS.objc_msgSend(this.id, OS.sel_reflectScrolledClipView_, cView !is null ? cView.id : null);
+}
 
-    public void setHasVerticalRuler (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHasVerticalRuler_1, flag);
-    }
-
-    public void setHasVerticalScroller (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHasVerticalScroller_1, flag);
-    }
+public void setAutohidesScrollers(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, flag);
+}
 
-    public void setHorizontalLineScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHorizontalLineScroll_1, value);
-    }
-
-    public void setHorizontalPageScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHorizontalPageScroll_1, value);
-    }
+public void setBorderType(NSBorderType aType) {
+    OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
+}
 
-    public void setHorizontalRulerView (NSRulerView ruler)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHorizontalRulerView_1, ruler !is null ? ruler.id_ : null);
-    }
-
-    public void setHorizontalScroller (NSScroller anObject)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setHorizontalScroller_1, anObject !is null ? anObject.id_ : null);
-    }
-
-    public void setLineScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setLineScroll_1, value);
-    }
-
-    public void setPageScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setPageScroll_1, value);
-    }
+public void setDocumentView(NSView aView) {
+    OS.objc_msgSend(this.id, OS.sel_setDocumentView_, aView !is null ? aView.id : null);
+}
 
-    public static void setRulerViewClass (objc.Class rulerViewClass)
-    {
-        OS.objc_msgSend(OS.class_NSScrollView, OS.sel_setRulerViewClass_1, rulerViewClass);
-    }
-
-    public void setRulersVisible (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setRulersVisible_1, flag);
-    }
+public void setDrawsBackground(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+}
 
-    public void setScrollsDynamically (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setScrollsDynamically_1, flag);
-    }
-
-    public void setVerticalLineScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setVerticalLineScroll_1, value);
-    }
+public void setHasHorizontalScroller(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_, flag);
+}
 
-    public void setVerticalPageScroll (CGFloat value)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setVerticalPageScroll_1, value);
-    }
-
-    public void setVerticalRulerView (NSRulerView ruler)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setVerticalRulerView_1, ruler !is null ? ruler.id_ : null);
-    }
-
-    public void setVerticalScroller (NSScroller anObject)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setVerticalScroller_1, anObject !is null ? anObject.id_ : null);
-    }
-
-    public void tile ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_tile);
-    }
+public void setHasVerticalScroller(bool flag) {
+    OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_, flag);
+}
 
-    public CGFloat verticalLineScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_verticalLineScroll);
-    }
-
-    public CGFloat verticalPageScroll ()
-    {
-        return cast(CGFloat) OS.objc_msgSend_fpret(this.id_, OS.sel_verticalPageScroll);
-    }
+public void setHorizontalScroller(NSScroller anObject) {
+    OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, anObject !is null ? anObject.id : null);
+}
 
-    public NSRulerView verticalRulerView ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_verticalRulerView);
-        return result !is null ? new NSRulerView(result) : null;
-    }
-
-    public NSScroller verticalScroller ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_verticalScroller);
-        return result !is null ? new NSScroller(result) : null;
-    }
+public void setVerticalScroller(NSScroller anObject) {
+    OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_, anObject !is null ? anObject.id : null);
+}
 
 }