--- a/dwt/internal/cocoa/NSAppleEventManager.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSAppleEventManager.d	Tue Aug 19 17:35:17 2008 +0200
@@ -13,8 +13,10 @@
  *******************************************************************************/
 module dwt.internal.cocoa.NSAppleEventManager;
 
+import dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSAppleEventDescriptor;
 import dwt.internal.cocoa.NSObject;
+import dwt.internal.cocoa.OS;
 import objc = dwt.internal.objc.runtime;
 
 public class NSAppleEventManager : NSObject
@@ -32,52 +34,52 @@
 
     public NSAppleEventDescriptor appleEventForSuspensionID (objc.id suspensionID)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_appleEventForSuspensionID_1, suspensionID);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_appleEventForSuspensionID_1, suspensionID);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public NSAppleEventDescriptor currentAppleEvent ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_currentAppleEvent);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_currentAppleEvent);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public NSAppleEventDescriptor currentReplyAppleEvent ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_currentReplyAppleEvent);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_currentReplyAppleEvent);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public short dispatchRawAppleEvent (objc.id theAppleEvent, objc.id theReply, objc.id handlerRefCon)
     {
-        return cast(short) OS.objc_msgSend(this.id, OS.sel_dispatchRawAppleEvent_1withRawReply_1handlerRefCon_1, theAppleEvent, theReply,
+        return cast(short) OS.objc_msgSend(this.id_, OS.sel_dispatchRawAppleEvent_1withRawReply_1handlerRefCon_1, theAppleEvent, theReply,
                 handlerRefCon);
     }
 
     public void removeEventHandlerForEventClass (objc.id eventClass, objc.id eventID)
     {
-        OS.objc_msgSend(this.id, OS.sel_removeEventHandlerForEventClass_1andEventID_1, eventClass, eventID);
+        OS.objc_msgSend(this.id_, OS.sel_removeEventHandlerForEventClass_1andEventID_1, eventClass, eventID);
     }
 
     public NSAppleEventDescriptor replyAppleEventForSuspensionID (objc.id suspensionID)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_replyAppleEventForSuspensionID_1, suspensionID);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_replyAppleEventForSuspensionID_1, suspensionID);
         return result !is null ? new NSAppleEventDescriptor(result) : null;
     }
 
     public void resumeWithSuspensionID (objc.id suspensionID)
     {
-        OS.objc_msgSend(this.id, OS.sel_resumeWithSuspensionID_1, suspensionID);
+        OS.objc_msgSend(this.id_, OS.sel_resumeWithSuspensionID_1, suspensionID);
     }
 
     public void setCurrentAppleEventAndReplyEventWithSuspensionID (objc.id suspensionID)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCurrentAppleEventAndReplyEventWithSuspensionID_1, suspensionID);
+        OS.objc_msgSend(this.id_, OS.sel_setCurrentAppleEventAndReplyEventWithSuspensionID_1, suspensionID);
     }
 
     public void setEventHandler (id handler, objc.id handleEventSelector, objc.id eventClass, objc.id eventID)
     {
-        OS.objc_msgSend(this.id, OS.sel_setEventHandler_1andSelector_1forEventClass_1andEventID_1, handler !is null ? handler.id : null,
+        OS.objc_msgSend(this.id_, OS.sel_setEventHandler_1andSelector_1forEventClass_1andEventID_1, handler !is null ? handler.id_ : null,
                 handleEventSelector, eventClass, eventID);
     }
 
@@ -89,6 +91,6 @@
 
     public objc.id suspendCurrentAppleEvent ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_suspendCurrentAppleEvent);
+        return OS.objc_msgSend(this.id_, OS.sel_suspendCurrentAppleEvent);
     }
 }