--- a/dwt/internal/cocoa/NSOpenPanel.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSOpenPanel.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,8 +13,12 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSOpenPanel;
 
+import dwt.internal.cocoa.id;
+import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSSavePanel;
+import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.NSWindow;
 import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
@@ -33,43 +37,43 @@
 
     public NSArray URLs ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_URLs);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_URLs);
         return result !is null ? new NSArray(result) : null;
     }
 
     public bool allowsMultipleSelection ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_allowsMultipleSelection) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_allowsMultipleSelection) !is null;
     }
 
     public void beginForDirectory (NSString path, NSString name, NSArray fileTypes, id delegatee, objc.SEL didEndSelector, void* contextInfo)
     {
-        OS.objc_msgSend(this.id, OS.sel_beginForDirectory_1file_1types_1modelessDelegate_1didEndSelector_1contextInfo_1,
-                path !is null ? path.id : null, name !is null ? name.id : null, fileTypes !is null ? fileTypes.id : null,
-                delegatee !is null ? delegatee.id : null, didEndSelector, contextInfo);
+        OS.objc_msgSend(this.id_, OS.sel_beginForDirectory_1file_1types_1modelessDelegate_1didEndSelector_1contextInfo_1,
+                path !is null ? path.id_ : null, name !is null ? name.id_ : null, fileTypes !is null ? fileTypes.id_ : null,
+                delegatee !is null ? delegatee.id_ : null, didEndSelector, contextInfo);
     }
 
     public void beginSheetForDirectory (NSString path, NSString name, NSArray fileTypes, NSWindow docWindow, id delegatee, objc.SEL didEndSelector,
             void* contextInfo)
     {
-        OS.objc_msgSend(this.id, OS.sel_beginSheetForDirectory_1file_1types_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1,
-                path !is null ? path.id : null, name !is null ? name.id : null, fileTypes !is null ? fileTypes.id : null,
-                docWindow !is null ? docWindow.id : null, delegatee !is null ? delegatee.id : null, didEndSelector, contextInfo);
+        OS.objc_msgSend(this.id_, OS.sel_beginSheetForDirectory_1file_1types_1modalForWindow_1modalDelegate_1didEndSelector_1contextInfo_1,
+                path !is null ? path.id_ : null, name !is null ? name.id_ : null, fileTypes !is null ? fileTypes.id_ : null,
+                docWindow !is null ? docWindow.id_ : null, delegatee !is null ? delegatee.id_ : null, didEndSelector, contextInfo);
     }
 
     public bool canChooseDirectories ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_canChooseDirectories) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_canChooseDirectories) !is null;
     }
 
     public bool canChooseFiles ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_canChooseFiles) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_canChooseFiles) !is null;
     }
 
     public NSArray filenames ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_filenames);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_filenames);
         return result !is null ? new NSArray(result) : null;
     }
 
@@ -81,38 +85,38 @@
 
     public bool resolvesAliases ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_resolvesAliases) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_resolvesAliases) !is null;
     }
 
     public NSInteger runModalForDirectory (NSString path, NSString name, NSArray fileTypes)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_runModalForDirectory_1file_1types_1, path !is null ? path.id : null, name !is null ? name.id : null,
-                fileTypes !is null ? fileTypes.id : null);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModalForDirectory_1file_1types_1, path !is null ? path.id_ : null, name !is null ? name.id_ : null,
+                fileTypes !is null ? fileTypes.id_ : null);
     }
 
     public NSInteger runModalForTypes (NSArray fileTypes)
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_runModalForTypes_1, fileTypes !is null ? fileTypes.id : null);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_runModalForTypes_1, fileTypes !is null ? fileTypes.id_ : null);
     }
 
     public void setAllowsMultipleSelection (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setAllowsMultipleSelection_1, flag);
     }
 
     public void setCanChooseDirectories (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setCanChooseDirectories_1, flag);
     }
 
     public void setCanChooseFiles (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setCanChooseFiles_1, flag);
     }
 
     public void setResolvesAliases (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setResolvesAliases_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setResolvesAliases_1, flag);
     }
 
 }