--- a/dwt/internal/cocoa/NSSearchFieldCell.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSSearchFieldCell.d	Tue Aug 19 17:35:17 2008 +0200
@@ -38,118 +38,118 @@
 
     public NSButtonCell cancelButtonCell ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_cancelButtonCell);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_cancelButtonCell);
         return result !is null ? new NSButtonCell(result) : null;
     }
 
     public NSRect cancelButtonRectForBounds (NSRect rect)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_cancelButtonRectForBounds_1, rect);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_cancelButtonRectForBounds_1, rect);
         return result;
     }
 
     public NSInteger maximumRecents ()
     {
-        return cast(NSInteger) OS.objc_msgSend(this.id, OS.sel_maximumRecents);
+        return cast(NSInteger) OS.objc_msgSend(this.id_, OS.sel_maximumRecents);
     }
 
     public NSArray recentSearches ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_recentSearches);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_recentSearches);
         return result !is null ? new NSArray(result) : null;
     }
 
     public NSString recentsAutosaveName ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_recentsAutosaveName);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_recentsAutosaveName);
         return result !is null ? new NSString(result) : null;
     }
 
     public void resetCancelButtonCell ()
     {
-        OS.objc_msgSend(this.id, OS.sel_resetCancelButtonCell);
+        OS.objc_msgSend(this.id_, OS.sel_resetCancelButtonCell);
     }
 
     public void resetSearchButtonCell ()
     {
-        OS.objc_msgSend(this.id, OS.sel_resetSearchButtonCell);
+        OS.objc_msgSend(this.id_, OS.sel_resetSearchButtonCell);
     }
 
     public NSButtonCell searchButtonCell ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_searchButtonCell);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_searchButtonCell);
         return result !is null ? new NSButtonCell(result) : null;
     }
 
     public NSRect searchButtonRectForBounds (NSRect rect)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_searchButtonRectForBounds_1, rect);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_searchButtonRectForBounds_1, rect);
         return result;
     }
 
     public NSMenu searchMenuTemplate ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_searchMenuTemplate);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_searchMenuTemplate);
         return result !is null ? new NSMenu(result) : null;
     }
 
     public NSRect searchTextRectForBounds (NSRect rect)
     {
         NSRect result;
-        OS.objc_msgSend_stret(result, this.id, OS.sel_searchTextRectForBounds_1, rect);
+        OS.objc_msgSend_stret(&result, this.id_, OS.sel_searchTextRectForBounds_1, rect);
         return result;
     }
 
     public bool sendsSearchStringImmediately ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_sendsSearchStringImmediately) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_sendsSearchStringImmediately) !is null;
     }
 
     public bool sendsWholeSearchString ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_sendsWholeSearchString) !is null;
+        return OS.objc_msgSend(this.id_, OS.sel_sendsWholeSearchString) !is null;
     }
 
     public void setCancelButtonCell (NSButtonCell cell)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCancelButtonCell_1, cell !is null ? cell.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setCancelButtonCell_1, cell !is null ? cell.id_ : null);
     }
 
     public void setMaximumRecents (NSInteger maxRecents)
     {
-        OS.objc_msgSend(this.id, OS.sel_setMaximumRecents_1, maxRecents);
+        OS.objc_msgSend(this.id_, OS.sel_setMaximumRecents_1, maxRecents);
     }
 
     public void setRecentSearches (NSArray searches)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRecentSearches_1, searches !is null ? searches.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setRecentSearches_1, searches !is null ? searches.id_ : null);
     }
 
     public void setRecentsAutosaveName (NSString string)
     {
-        OS.objc_msgSend(this.id, OS.sel_setRecentsAutosaveName_1, string !is null ? string.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setRecentsAutosaveName_1, string !is null ? string.id_ : null);
     }
 
     public void setSearchButtonCell (NSButtonCell cell)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSearchButtonCell_1, cell !is null ? cell.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setSearchButtonCell_1, cell !is null ? cell.id_ : null);
     }
 
     public void setSearchMenuTemplate (NSMenu menu)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSearchMenuTemplate_1, menu !is null ? menu.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setSearchMenuTemplate_1, menu !is null ? menu.id_ : null);
     }
 
     public void setSendsSearchStringImmediately (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSendsSearchStringImmediately_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setSendsSearchStringImmediately_1, flag);
     }
 
     public void setSendsWholeSearchString (bool flag)
     {
-        OS.objc_msgSend(this.id, OS.sel_setSendsWholeSearchString_1, flag);
+        OS.objc_msgSend(this.id_, OS.sel_setSendsWholeSearchString_1, flag);
     }
 
 }