--- a/dwt/internal/cocoa/NSOpenGLContext.d	Sat Aug 09 17:00:02 2008 +0200
+++ b/dwt/internal/cocoa/NSOpenGLContext.d	Tue Aug 19 17:35:17 2008 +0200
@@ -55,7 +55,7 @@
 
     public void* CGLContextObj ()
     {
-        return cast(void*) OS.objc_msgSend(this.id, OS.sel_CGLContextObj);
+        return cast(void*) OS.objc_msgSend(this.id_, OS.sel_CGLContextObj);
     }
 
     public static void clearCurrentContext ()
@@ -65,17 +65,17 @@
 
     public void clearDrawable ()
     {
-        OS.objc_msgSend(this.id, OS.sel_clearDrawable);
+        OS.objc_msgSend(this.id_, OS.sel_clearDrawable);
     }
 
     public void copyAttributesFromContext (NSOpenGLContext context, GLbitfield mask)
     {
-        OS.objc_msgSend(this.id, OS.sel_copyAttributesFromContext_1withMask_1, context !is null ? context.id : null, mask);
+        OS.objc_msgSend(this.id_, OS.sel_copyAttributesFromContext_1withMask_1, context !is null ? context.id_ : null, mask);
     }
 
     public void createTexture (GLenum target, NSView view, GLenum format)
     {
-        OS.objc_msgSend(this.id, OS.sel_createTexture_1fromView_1internalFormat_1, target, view !is null ? view.id : null, format);
+        OS.objc_msgSend(this.id_, OS.sel_createTexture_1fromView_1internalFormat_1, target, view !is null ? view.id_ : null, format);
     }
 
     public static NSOpenGLContext currentContext ()
@@ -86,91 +86,91 @@
 
     public GLint currentVirtualScreen ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_currentVirtualScreen);
+        return cast(GLint) OS.objc_msgSend(this.id_, OS.sel_currentVirtualScreen);
     }
 
     public void flushBuffer ()
     {
-        OS.objc_msgSend(this.id, OS.sel_flushBuffer);
+        OS.objc_msgSend(this.id_, OS.sel_flushBuffer);
     }
 
     public void getValues (GLint* vals, NSOpenGLContextParameter param)
     {
-        OS.objc_msgSend(this.id, OS.sel_getValues_1forParameter_1, vals, param);
+        OS.objc_msgSend(this.id_, OS.sel_getValues_1forParameter_1, vals, param);
     }
 
     public NSOpenGLContext initWithFormat (NSOpenGLPixelFormat format, NSOpenGLContext share)
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithFormat_1shareContext_1, format !is null ? format.id : null,
-                share !is null ? share.id : null);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithFormat_1shareContext_1, format !is null ? format.id_ : null,
+                share !is null ? share.id_ : null);
         return result !is null ? this : null;
     }
 
     public void makeCurrentContext ()
     {
-        OS.objc_msgSend(this.id, OS.sel_makeCurrentContext);
+        OS.objc_msgSend(this.id_, OS.sel_makeCurrentContext);
     }
 
     public NSOpenGLPixelBuffer pixelBuffer ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_pixelBuffer);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_pixelBuffer);
         return result !is null ? new NSOpenGLPixelBuffer(result) : null;
     }
 
     public GLenum pixelBufferCubeMapFace ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_pixelBufferCubeMapFace);
+        return cast(GLenum) OS.objc_msgSend(this.id_, OS.sel_pixelBufferCubeMapFace);
     }
 
     public GLint pixelBufferMipMapLevel ()
     {
-        return OS.objc_msgSend(this.id, OS.sel_pixelBufferMipMapLevel);
+        return cast(GLint) OS.objc_msgSend(this.id_, OS.sel_pixelBufferMipMapLevel);
     }
 
     public void setCurrentVirtualScreen (GLint screen)
     {
-        OS.objc_msgSend(this.id, OS.sel_setCurrentVirtualScreen_1, screen);
+        OS.objc_msgSend(this.id_, OS.sel_setCurrentVirtualScreen_1, screen);
     }
 
     public void setFullScreen ()
     {
-        OS.objc_msgSend(this.id, OS.sel_setFullScreen);
+        OS.objc_msgSend(this.id_, OS.sel_setFullScreen);
     }
 
     public void setOffScreen (void* baseaddr, GLsizei width, GLsizei height, GLint rowbytes)
     {
-        OS.objc_msgSend(this.id, OS.sel_setOffScreen_1width_1height_1rowbytes_1, baseaddr, width, height, rowbytes);
+        OS.objc_msgSend(this.id_, OS.sel_setOffScreen_1width_1height_1rowbytes_1, baseaddr, width, height, rowbytes);
     }
 
     public void setPixelBuffer (NSOpenGLPixelBuffer pixelBuffer, GLenum face, GLint level, GLint screen)
     {
-        OS.objc_msgSend(this.id, OS.sel_setPixelBuffer_1cubeMapFace_1mipMapLevel_1currentVirtualScreen_1,
-                pixelBuffer !is null ? pixelBuffer.id : null, face, level, screen);
+        OS.objc_msgSend(this.id_, OS.sel_setPixelBuffer_1cubeMapFace_1mipMapLevel_1currentVirtualScreen_1,
+                pixelBuffer !is null ? pixelBuffer.id_ : null, face, level, screen);
     }
 
     public void setTextureImageToPixelBuffer (NSOpenGLPixelBuffer pixelBuffer, GLenum source)
     {
-        OS.objc_msgSend(this.id, OS.sel_setTextureImageToPixelBuffer_1colorBuffer_1, pixelBuffer !is null ? pixelBuffer.id : null, source);
+        OS.objc_msgSend(this.id_, OS.sel_setTextureImageToPixelBuffer_1colorBuffer_1, pixelBuffer !is null ? pixelBuffer.id_ : null, source);
     }
 
     public void setValues (/*const*/GLint* vals, NSOpenGLContextParameter param)
     {
-        OS.objc_msgSend(this.id, OS.sel_setValues_1forParameter_1, vals, param);
+        OS.objc_msgSend(this.id_, OS.sel_setValues_1forParameter_1, vals, param);
     }
 
     public void setView (NSView view)
     {
-        OS.objc_msgSend(this.id, OS.sel_setView_1, view !is null ? view.id : null);
+        OS.objc_msgSend(this.id_, OS.sel_setView_1, view !is null ? view.id_ : null);
     }
 
     public void update ()
     {
-        OS.objc_msgSend(this.id, OS.sel_update);
+        OS.objc_msgSend(this.id_, OS.sel_update);
     }
 
     public NSView view ()
     {
-        objc.id result = OS.objc_msgSend(this.id, OS.sel_view);
+        objc.id result = OS.objc_msgSend(this.id_, OS.sel_view);
         return result !is null ? new NSView(result) : null;
     }