--- a/dwt/internal/cocoa/NSWindowController.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSWindowController.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,6 +13,7 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSWindowController;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSDocument;
 import dwt.internal.cocoa.NSResponder;
 import dwt.internal.cocoa.NSString;
@@ -35,145 +36,145 @@
 
     public void close ()
     {
-        OS.objc_msgSend(this.id, OS.sel_close);
+        OS.objc_msgSend(this.id_, OS.sel_close);
     }
 
     public id document ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_document);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_document);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithWindow (NSWindow window)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithWindow_1, window !is null ? window.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithWindow_1, window !is null ? window.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithWindowNibName_ (NSString windowNibName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibName_1, windowNibName !is null ? windowNibName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithWindowNibName_1, windowNibName !is null ? windowNibName.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithWindowNibName_owner_ (NSString windowNibName, id owner)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibName_1owner_1, windowNibName !is null ? windowNibName.id : null,
-                owner !is null ? owner.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithWindowNibName_1owner_1, windowNibName !is null ? windowNibName.id_ : null,
+                owner !is null ? owner.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public id initWithWindowNibPath (NSString windowNibPath, id owner)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithWindowNibPath_1owner_1, windowNibPath !is null ? windowNibPath.id : null,
-                owner !is null ? owner.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithWindowNibPath_1owner_1, windowNibPath !is null ? windowNibPath.id_ : null,
+                owner !is null ? owner.id_ : null);
         return result !is null ? new id(result) : null;
     }
 
     public bool isWindowLoaded ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_isWindowLoaded) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_isWindowLoaded) !is null;
     }
 
     public void loadWindow ()
     {
-        OS.objc_msgSend(this.id, OS.sel_loadWindow);
+        OS.objc_msgSend(this.id_, OS.sel_loadWindow);
     }
 
     public id owner ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_owner);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_owner);
         return result !is null ? new id(result) : null;
     }
 
     public void setDocument (NSDocument document)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDocument_1, document !is null ? document.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setDocument_1, document !is null ? document.id_ : null);
     }
 
     public void setDocumentEdited (bool dirtyFlag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setDocumentEdited_1, dirtyFlag);
+        OS.objc_msgSend(this.id_, OS.sel_setDocumentEdited_1, dirtyFlag);
     }
 
     public void setShouldCascadeWindows (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setShouldCascadeWindows_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setShouldCascadeWindows_1, flag);
     }
 
     public void setShouldCloseDocument (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setShouldCloseDocument_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setShouldCloseDocument_1, flag);
     }
 
     public void setWindow (NSWindow window)
     {
-        OS.objc_msgSend(this.id, OS.sel_setWindow_1, window !is null ? window.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setWindow_1, window !is null ? window.id_ : null);
     }
 
     public void setWindowFrameAutosaveName (NSString name)
     {
-        OS.objc_msgSend(this.id, OS.sel_setWindowFrameAutosaveName_1, name !is null ? name.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setWindowFrameAutosaveName_1, name !is null ? name.id_ : null);
     }
 
     public bool shouldCascadeWindows ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_shouldCascadeWindows) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_shouldCascadeWindows) !is null;
     }
 
     public bool shouldCloseDocument ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_shouldCloseDocument) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_shouldCloseDocument) !is null;
     }
 
     public void showWindow (id sender)
     {
-        OS.objc_msgSend(this.id, OS.sel_showWindow_1, sender !is null ? sender.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_showWindow_1, sender !is null ? sender.id_ : null);
     }
 
     public void synchronizeWindowTitleWithDocumentName ()
     {
-        OS.objc_msgSend(this.id, OS.sel_synchronizeWindowTitleWithDocumentName);
+        OS.objc_msgSend(this.id_, OS.sel_synchronizeWindowTitleWithDocumentName);
     }
 
     public NSWindow window ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_window);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_window);
         return result !is null ? new NSWindow(result) : null;
     }
 
     public void windowDidLoad ()
     {
-        OS.objc_msgSend(this.id, OS.sel_windowDidLoad);
+        OS.objc_msgSend(this.id_, OS.sel_windowDidLoad);
     }
 
     public NSString windowFrameAutosaveName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_windowFrameAutosaveName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_windowFrameAutosaveName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString windowNibName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_windowNibName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_windowNibName);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString windowNibPath ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_windowNibPath);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_windowNibPath);
         return result !is null ? new NSString(result) : null;
     }
 
     public NSString windowTitleForDocumentDisplayName (NSString displayName)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_windowTitleForDocumentDisplayName_1, displayName !is null ? displayName.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_windowTitleForDocumentDisplayName_1, displayName !is null ? displayName.id_ : null);
         return result !is null ? new NSString(result) : null;
     }
 
     public void windowWillLoad ()
     {
-        OS.objc_msgSend(this.id, OS.sel_windowWillLoad);
+        OS.objc_msgSend(this.id_, OS.sel_windowWillLoad);
     }
 
 }