--- a/dwt/internal/cocoa/NSConditionLock.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSConditionLock.d	Tue Aug 19 17:35:17 2008 +0200
@@ -36,54 +36,54 @@
 
     public NSInteger condition ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_condition);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_condition);
     }
 
     public id initWithCondition (NSInteger condition)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithCondition_1, condition);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithCondition_1, condition);
         return result !is null ? new id(result) : null;
     }
 
     public bool lockBeforeDate (NSDate limit)
     {
-        return OS.objc_msgSend(this.id, OS.sel_lockBeforeDate_1, limit !is null ? limit.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_lockBeforeDate_1, limit !is null ? limit.id_ : null) !is null;
     }
 
     public void lockWhenCondition_ (NSInteger condition)
     {
-        OS.objc_msgSend(this.id, OS.sel_lockWhenCondition_1, condition);
+        OS.objc_msgSend(this.id_, OS.sel_lockWhenCondition_1, condition);
     }
 
     public bool lockWhenCondition_beforeDate_ (NSInteger condition, NSDate limit)
     {
-        return OS.objc_msgSend(this.id, OS.sel_lockWhenCondition_1beforeDate_1, condition, limit !is null ? limit.id : null) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_lockWhenCondition_1beforeDate_1, condition, limit !is null ? limit.id_ : null) !is null;
     }
 
     public NSString name ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_name);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_name);
         return result !is null ? new NSString(result) : null;
     }
 
     public void setName (NSString n)
     {
-        OS.objc_msgSend(this.id, OS.sel_setName_1, n !is null ? n.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setName_1, n !is null ? n.id_ : null);
     }
 
     public bool tryLock ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_tryLock) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_tryLock) !is null;
     }
 
     public bool tryLockWhenCondition (NSInteger condition)
     {
-        return OS.objc_msgSend(this.id, OS.sel_tryLockWhenCondition_1, condition) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_tryLockWhenCondition_1, condition) !is null;
     }
 
     public void unlockWithCondition (NSInteger condition)
     {
-        OS.objc_msgSend(this.id, OS.sel_unlockWithCondition_1, condition);
+        OS.objc_msgSend(this.id_, OS.sel_unlockWithCondition_1, condition);
     }
 
 }