--- a/dwt/internal/cocoa/NSPort.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSPort.d	Tue Aug 19 17:35:17 2008 +0200
@@ -42,8 +42,8 @@
 
     public void addConnection (NSConnection conn, NSRunLoop runLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_addConnection_1toRunLoop_1forMode_1, conn !is null ? conn.id : null, runLoop !is null ? runLoop.id : null,
-                mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_addConnection_1toRunLoop_1forMode_1, conn !is null ? conn.id_ : null, runLoop !is null ? runLoop.id_ : null,
+                mode !is null ? mode.id_ : null);
     }
 
     public static id allocWithZone (NSZone* zone)
@@ -54,18 +54,18 @@
 
     public id delegatee ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_delegate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_delegate);
         return result !is null ? new id(result) : null;
     }
 
     public void invalidate ()
     {
-        OS.objc_msgSend(this.id, OS.sel_invalidate);
+        OS.objc_msgSend(this.id_, OS.sel_invalidate);
     }
 
     public bool isValid ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isValid) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isValid) !is null;
     }
 
     public static NSPort port ()
@@ -76,41 +76,41 @@
 
     public void removeConnection (NSConnection conn, NSRunLoop runLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeConnection_1fromRunLoop_1forMode_1, conn !is null ? conn.id : null,
-                runLoop !is null ? runLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeConnection_1fromRunLoop_1forMode_1, conn !is null ? conn.id_ : null,
+                runLoop !is null ? runLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public void removeFromRunLoop (NSRunLoop runLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeFromRunLoop_1forMode_1, runLoop !is null ? runLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_removeFromRunLoop_1forMode_1, runLoop !is null ? runLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public NSUInteger reservedSpaceLength ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_reservedSpaceLength);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_reservedSpaceLength);
     }
 
     public void scheduleInRunLoop (NSRunLoop runLoop, NSString mode)
     {
-        OS.objc_msgSend(this.id, OS.sel_scheduleInRunLoop_1forMode_1, runLoop !is null ? runLoop.id : null, mode !is null ? mode.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_scheduleInRunLoop_1forMode_1, runLoop !is null ? runLoop.id_ : null, mode !is null ? mode.id_ : null);
     }
 
     public bool sendBeforeDate_components_from_reserved_ (NSDate limitDate, NSMutableArray components, NSPort receivePort, NSUInteger headerSpaceReserved)
     {
-        return OS.objc_msgSend(this.id, OS.sel_sendBeforeDate_1components_1from_1reserved_1, limitDate !is null ? limitDate.id : null,
-                components !is null ? components.id : null, receivePort !is null ? receivePort.id : null, headerSpaceReserved) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_sendBeforeDate_1components_1from_1reserved_1, limitDate !is null ? limitDate.id_ : null,
+                components !is null ? components.id_ : null, receivePort !is null ? receivePort.id_ : null, headerSpaceReserved) !is null;
     }
 
     public bool sendBeforeDate_msgid_components_from_reserved_ (NSDate limitDate, NSUInteger msgID, NSMutableArray components, NSPort receivePort,
                                                                 NSUInteger headerSpaceReserved)
     {
-        return OS.objc_msgSend(this.id, OS.sel_sendBeforeDate_1msgid_1components_1from_1reserved_1, limitDate !is null ? limitDate.id : null, msgID,
-                components !is null ? components.id : null, receivePort !is null ? receivePort.id : null, headerSpaceReserved) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_sendBeforeDate_1msgid_1components_1from_1reserved_1, limitDate !is null ? limitDate.id_ : null, msgID,
+                components !is null ? components.id_ : null, receivePort !is null ? receivePort.id_ : null, headerSpaceReserved) !is null;
     }
 
     public void setDelegate (id anId)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDelegate_1, anId !is null ? anId.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDelegate_1, anId !is null ? anId.id_ : null);
     }
 
 }