--- a/dwt/internal/cocoa/NSColorSpace.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSColorSpace.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,149 +1,42 @@
 /*******************************************************************************
- * 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.NSColorSpace;
 
-import dwt.internal.cocoa.CGColorSpace;
-import dwt.internal.cocoa.NSData;
-import dwt.internal.cocoa.NSInteger;
+import dwt.dwthelper.utils;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSObject;
-import dwt.internal.cocoa.NSString;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
-alias NSInteger NSColorSpaceModel;
+public class NSColorSpace : NSObject {
 
-enum
-{
-    NSUnknownColorSpaceModel = -1,
-    NSGrayColorSpaceModel,
-    NSRGBColorSpaceModel,
-    NSCMYKColorSpaceModel,
-    NSLABColorSpaceModel,
-    NSDeviceNColorSpaceModel,
-    NSIndexedColorSpaceModel,
-    NSPatternColorSpaceModel
+public this() {
+    super();
+}
+
+public this(objc.id id) {
+    super(id);
 }
 
-public class NSColorSpace : NSObject
-{
-
-    public this ()
-    {
-        super();
-    }
-
-    public this (objc.id id)
-    {
-        super(id);
-    }
-
-    public objc.id CGColorSpace ()
-    {
-        return OS.objc_msgSend(this.id_, OS.sel_CGColorSpace);
-    }
-
-    public NSData ICCProfileData ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_ICCProfileData);
-        return result !is null ? new NSData(result) : null;
-    }
-
-    public static NSColorSpace adobeRGB1998ColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_adobeRGB1998ColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public NSColorSpaceModel colorSpaceModel ()
-    {
-        return cast(NSColorSpaceModel) OS.objc_msgSend(this.id_, OS.sel_colorSpaceModel);
-    }
-
-    public void* colorSyncProfile ()
-    {
-        return cast(void*) OS.objc_msgSend(this.id_, OS.sel_colorSyncProfile);
-    }
-
-    public static NSColorSpace deviceCMYKColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceCMYKColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public static NSColorSpace deviceGrayColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceGrayColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
+public this(cocoa.id id) {
+    super(id);
+}
 
-    public static NSColorSpace deviceRGBColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceRGBColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public static NSColorSpace genericCMYKColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericCMYKColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public static NSColorSpace genericGrayColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericGrayColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public static NSColorSpace genericRGBColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_genericRGBColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
-
-    public NSColorSpace initWithCGColorSpace (CGColorSpaceRef cgColorSpace)
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithCGColorSpace_1, cgColorSpace);
-        return result !is null ? this : null;
-    }
-
-    public NSColorSpace initWithColorSyncProfile (void* prof)
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithColorSyncProfile_1, prof);
-        return result !is null ? this : null;
-    }
-
-    public NSColorSpace initWithICCProfileData (NSData iccData)
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithICCProfileData_1, iccData !is null ? iccData.id_ : null);
-        return result !is null ? this : null;
-    }
-
-    public NSString localizedName ()
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_localizedName);
-        return result !is null ? new NSString(result) : null;
-    }
-
-    public NSInteger numberOfColorComponents ()
-    {
-        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_numberOfColorComponents);
-    }
-
-    public static NSColorSpace sRGBColorSpace ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_sRGBColorSpace);
-        return result !is null ? new NSColorSpace(result) : null;
-    }
+public static NSColorSpace deviceRGBColorSpace() {
+    objc.id result = OS.objc_msgSend(OS.class_NSColorSpace, OS.sel_deviceRGBColorSpace);
+    return result !is null ? new NSColorSpace(result) : null;
+}
 
 }