--- a/dwt/internal/cocoa/NSThread.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSThread.d	Tue Aug 19 17:35:17 2008 +0200
@@ -44,7 +44,7 @@
 
     public void cancel ()
     {
-        OS.objc_msgSend(this.id, OS.sel_cancel);
+        OS.objc_msgSend(this.id_, OS.sel_cancel);
     }
 
     public static NSThread currentThread ()
@@ -55,8 +55,8 @@
 
     public static void detachNewThreadSelector (objc.SEL selector, id target, id argument)
     {
-        OS.objc_msgSend(OS.class_NSThread, OS.sel_detachNewThreadSelector_1toTarget_1withObject_1, selector, target !is null ? target.id : null,
-                argument !is null ? argument.id : null);
+        OS.objc_msgSend(OS.class_NSThread, OS.sel_detachNewThreadSelector_1toTarget_1withObject_1, selector, target !is null ? target.id_ : null,
+                argument !is null ? argument.id_ : null);
     }
 
     public static void exit ()
@@ -66,24 +66,24 @@
 
     public id initWithTarget (id target, objc.SEL selector, id argument)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTarget_1selector_1object_1, target !is null ? target.id : null, selector,
-                argument !is null ? argument.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTarget_1selector_1object_1, target !is null ? target.id_ : null, selector,
+                argument !is null ? argument.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isCancelled ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isCancelled) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isCancelled) !is null;
     }
 
     public bool isExecuting ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isExecuting) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isExecuting) !is null;
     }
 
     public bool isFinished ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isFinished) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isFinished) !is null;
     }
 
     public static bool static_isMainThread ()
@@ -93,7 +93,7 @@
 
     public bool isMainThread ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isMainThread) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isMainThread) !is null;
     }
 
     public static bool isMultiThreaded ()
@@ -103,7 +103,7 @@
 
     public void main ()
     {
-        OS.objc_msgSend(this.id, OS.sel_main);
+        OS.objc_msgSend(this.id_, OS.sel_main);
     }
 
     public static NSThread mainThread ()
@@ -114,18 +114,18 @@
 
     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 void setStackSize (NSUInteger s)
     {
-        OS.objc_msgSend(this.id, OS.sel_setStackSize_1, s);
+        OS.objc_msgSend(this.id_, OS.sel_setStackSize_1, s);
     }
 
     public static bool setThreadPriority (double p)
@@ -140,22 +140,22 @@
 
     public static void sleepUntilDate (NSDate date)
     {
-        OS.objc_msgSend(OS.class_NSThread, OS.sel_sleepUntilDate_1, date !is null ? date.id : null);
+        OS.objc_msgSend(OS.class_NSThread, OS.sel_sleepUntilDate_1, date !is null ? date.id_ : null);
     }
 
     public NSUInteger stackSize ()
     {
-        return cast(NSUInteger) OS.objc_msgSend(this.id, OS.sel_stackSize);
+        return cast(NSUInteger) OS.objc_msgSend(this.id_, OS.sel_stackSize);
     }
 
     public void start ()
     {
-        OS.objc_msgSend(this.id, OS.sel_start);
+        OS.objc_msgSend(this.id_, OS.sel_start);
     }
 
     public NSMutableDictionary threadDictionary ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_threadDictionary);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_threadDictionary);
         return result !is null ? new NSMutableDictionary(result) : null;
     }