X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FDarwin.java;h=34030caf2e0105d24e334261ed3ccfb103bfad41;hb=c6069948906645d974f46bdb96617a9a6a504636;hp=5097cf0dc3a59f3f406b3996593d841bb856001e;hpb=6ceff140094edbc5fa919aa17a23c3d00612b458;p=org.ibex.core.git

diff --git a/src/org/xwt/plat/Darwin.java b/src/org/xwt/plat/Darwin.java
index 5097cf0..34030ca 100644
--- a/src/org/xwt/plat/Darwin.java
+++ b/src/org/xwt/plat/Darwin.java
@@ -179,7 +179,7 @@ public class Darwin extends POSIX {
         public void _sizeChange(int w, int h) { SizeChange(w,h); }
         
         /* Drawing stuff */
-        public abstract void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
+        public abstract void blit(PixelBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
 
         public final void _dispose() { CarbonMessage.add(new CarbonMessage() { public void perform() { natDispose(); } }); }
         public native void natDispose();
@@ -196,7 +196,7 @@ public class Darwin extends POSIX {
         public void reshape(int w, int h) { }
     }
     
-    static class GLCarbonDoubleBuffer extends OpenGL.GLDoubleBuffer {
+    static class GLCarbonPixelBuffer extends OpenGL.GLDoubleBuffer {
         RawData rawCTX;
         RawData rawWindowRef;
         int textureName;
@@ -211,12 +211,12 @@ public class Darwin extends POSIX {
             if(!gl.rectangularTextures) n = OpenGL.roundToPowerOf2(n);
             return Math.min(n,gl.maxAglSurfaceTexSize);
         }
-        public GLCarbonDoubleBuffer(int w, int h, final CarbonOpenGL gl) {
+        public GLCarbonPixelBuffer(int w, int h, final CarbonOpenGL gl) {
             super(fixupDimension(gl,w),fixupDimension(gl,h));
             this.gl = gl;
             rectTexture = gl.hasRectangularTextures();
             final Semaphore sem = new Semaphore();
-            CarbonMessage.add(new CarbonMessage() { public void perform() { GLCarbonDoubleBuffer.this.natInit(); sem.release(); } });
+            CarbonMessage.add(new CarbonMessage() { public void perform() { GLCarbonPixelBuffer.this.natInit(); sem.release(); } });
             sem.block();
         }
         public native void activateContext();
@@ -256,9 +256,9 @@ public class Darwin extends POSIX {
             super.setSize(w,h);
         }
         
-        private native void natBlit(GLCarbonDoubleBuffer db, int sx, int sy, int dx, int dy, int dx2, int dy2);
-        public synchronized void blit(DoubleBuffer db, int sx, int sy, int dx, int dy, int dx2, int dy2) {
-            natBlit((GLCarbonDoubleBuffer)db,sx,sy,dx,dy,dx2,dy2);
+        private native void natBlit(GLCarbonPixelBuffer db, int sx, int sy, int dx, int dy, int dx2, int dy2);
+        public synchronized void blit(PixelBuffer db, int sx, int sy, int dx, int dy, int dx2, int dy2) {
+            natBlit((GLCarbonPixelBuffer)db,sx,sy,dx,dy,dx2,dy2);
         }
         
         private native void natReshape(int w, int h);
@@ -267,16 +267,16 @@ public class Darwin extends POSIX {
         public native void natDispose();
     }
 
-    /*private class QZCarbonDoubleBuffer extends DoubleBuffer {
+    /*private class QZCarbonPixelBuffer extends DoubleBuffer {
         
-        public QZCarbonDoubleBuffer(int width, int height) {
+        public QZCarbonPixelBuffer(int width, int height) {
         }
     }
        private class QZCarbonSurface extends CarbonSurface {
         public QZCarbonSurface(Box root, boolean framed) {
             super(b,root);
         }
-        public native void blit(DoubleBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
+        public native void blit(PixelBuffer s, int sx, int sy, int dx, int dy, int dx2, int dy2);
     }
     
     private class QZCarbonPicture extends Picture {
@@ -292,11 +292,11 @@ public class Darwin extends POSIX {
         }
     }*/
     
-    protected DoubleBuffer _createDoubleBuffer(int w, int h, Surface owner) {
+    protected PixelBuffer _createDoubleBuffer(int w, int h, Surface owner) {
         if(openGL != null)
-            return new GLCarbonDoubleBuffer(w,h,openGL);
+            return new GLCarbonPixelBuffer(w,h,openGL);
         else
-            return /*new QZCarbonDoubleBuffer(w,h)*/ null;
+            return /*new QZCarbonPixelBuffer(w,h)*/ null;
     }
     protected Surface _createSurface(Box b, boolean framed) {
         if(openGL != null)