--- a/dwt/internal/cocoa/NSImageView.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSImageView.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,106 +1,59 @@
 /*******************************************************************************
- * 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.NSImageView;
 
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
+import dwt.internal.cocoa.NSCell;
 import dwt.internal.cocoa.NSControl;
 import dwt.internal.cocoa.NSImage;
-import dwt.internal.cocoa.NSImageCell : NSImageAlignment, NSImageFrameStyle, NSImageScaling;
+import dwt.internal.cocoa.NSImageCell;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-public class NSImageView : NSControl
-{
-
-    public this ()
-    {
-        super();
-    }
+public class NSImageView : NSControl {
 
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public bool allowsCutCopyPaste ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_allowsCutCopyPaste) !is null;
-    }
+public this() {
+    super();
+}
 
-    public bool animates ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_animates) !is null;
-    }
+public this(objc.id id) {
+    super(id);
+}
 
-    public NSImage image ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_image);
-        return result !is null ? new NSImage(result) : null;
-    }
-
-    public NSImageAlignment imageAlignment ()
-    {
-        return cast(NSImageAlignment) OS.objc_msgSend(this.id_, OS.sel_imageAlignment);
-    }
-
-    public NSImageFrameStyle imageFrameStyle ()
-    {
-        return cast(NSImageFrameStyle) OS.objc_msgSend(this.id_, OS.sel_imageFrameStyle);
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public NSImageScaling imageScaling ()
-    {
-        return cast(NSImageScaling) OS.objc_msgSend(this.id_, OS.sel_imageScaling);
-    }
-
-    public bool isEditable ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_isEditable) !is null;
-    }
+public void setImage(NSImage newImage) {
+    OS.objc_msgSend(this.id, OS.sel_setImage_, newImage !is null ? newImage.id : null);
+}
 
-    public void setAllowsCutCopyPaste (bool allow)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setAllowsCutCopyPaste_1, allow);
-    }
-
-    public void setAnimates (bool flag)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setAnimates_1, flag);
-    }
+public void setImageAlignment(NSImageAlignment newAlign) {
+    OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, newAlign);
+}
 
-    public void setEditable (bool yn)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setEditable_1, yn);
-    }
-
-    public void setImage (NSImage newImage)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setImage_1, newImage !is null ? newImage.id_ : null);
-    }
+public void setImageScaling(NSImageScaling newScaling) {
+    OS.objc_msgSend(this.id, OS.sel_setImageScaling_, newScaling);
+}
 
-    public void setImageAlignment (NSImageAlignment newAlign)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setImageAlignment_1, newAlign);
-    }
+public static objc.Class cellClass() {
+    return OS.objc_msgSend(OS.class_NSImageView, OS.sel_cellClass);
+}
 
-    public void setImageFrameStyle (NSImageFrameStyle newStyle)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setImageFrameStyle_1, newStyle);
-    }
-
-    public void setImageScaling (NSImageScaling newScaling)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setImageScaling_1, newScaling);
-    }
+public static void setCellClass(objc.Class factoryId) {
+    OS.objc_msgSend(OS.class_NSImageView, OS.sel_setCellClass_, factoryId);
+}
 
 }