--- a/dwt/internal/cocoa/NSBitmapImageRep.d	Sat Jan 17 16:26:49 2009 +0100
+++ b/dwt/internal/cocoa/NSBitmapImageRep.d	Sun Jan 18 18:39:46 2009 +0100
@@ -38,11 +38,10 @@
 
 public this (cocoa.id id) {
     super(id);
-
 }
 
-public objc.id bitmapData () {
-    return OS.objc_msgSend(this.id, OS.sel_bitmapData);
+public ubyte* bitmapData () {
+    return cast(ubyte*) OS.objc_msgSend(this.id, OS.sel_bitmapData);
 }
 
 public NSInteger bitsPerPixel () {
@@ -58,13 +57,13 @@
 }
 
 public NSBitmapImageRep initWithBitmapDataPlanes (ubyte** planes, NSInteger width, NSInteger height, NSInteger bps, NSInteger spp, bool alpha, bool isPlanar, NSString colorSpaceName, NSBitmapFormat bitmapFormat, NSInteger rBytes, NSInteger pBits) {
-    objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName !is null ? colorSpaceName.id : null, bitmapFormat, rBytes, pBits);
-    return result !is null ? this : null;
+	objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName !is null ? colorSpaceName.id : null, bitmapFormat, rBytes, pBits);
+	return result is this.id ? this : (result !is null ? new NSBitmapImageRep(result) : null);
 }
 
 public NSBitmapImageRep initWithBitmapDataPlanes (ubyte** planes, NSInteger width, NSInteger height, NSInteger bps, NSInteger spp, bool alpha, bool isPlanar, NSString colorSpaceName, NSInteger rBytes, NSInteger pBits) {
-    objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName !is null ? colorSpaceName.id : null, rBytes, pBits);
-    return result !is null ? this : null;
+	objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_, planes, width, height, bps, spp, alpha, isPlanar, colorSpaceName !is null ? colorSpaceName.id : null, rBytes, pBits);
+	return result is this.id ? this : (result !is null ? new NSBitmapImageRep(result) : null);
 }
 
 public bool isPlanar () {