X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=src%2Forg%2Fxwt%2Fplat%2FDarwin.cc;h=c38f17391901bcd2e52684a302b886fb4b427d5c;hp=716719f412909144ab781be1685a30f68678b958;hb=c6069948906645d974f46bdb96617a9a6a504636;hpb=cf3587e2fd5966b7ebfd721d9413674224d1ad2a diff --git a/src/org/xwt/plat/Darwin.cc b/src/org/xwt/plat/Darwin.cc index 716719f..c38f173 100644 --- a/src/org/xwt/plat/Darwin.cc +++ b/src/org/xwt/plat/Darwin.cc @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -899,7 +899,7 @@ void Darwin$CarbonOpenGL::initSharedContext() { checkStatus(rawSharedContext,"aglCreateContext"); } -void Darwin$GLCarbonDoubleBuffer::natInit() { +void Darwin$GLCarbonPixelBuffer::natInit() { WindowClass wc = kPlainWindowClass; WindowAttributes attr = 0; WindowRef window; @@ -948,19 +948,19 @@ void Darwin$GLCarbonDoubleBuffer::natInit() { rawCTX = (RawData*) ctx; } -void Darwin$GLCarbonDoubleBuffer::activateContext() { +void Darwin$GLCarbonPixelBuffer::activateContext() { AGLContext ctx = (AGLContext) rawCTX; aglSetCurrentContext(ctx); } -void Darwin$GLCarbonDoubleBuffer::natCleanup(RawData* rawWindowRef, RawData* rawCTX) { +void Darwin$GLCarbonPixelBuffer::natCleanup(RawData* rawWindowRef, RawData* rawCTX) { WindowRef window = (WindowRef) rawWindowRef; AGLContext ctx = (AGLContext) rawCTX; aglDestroyContext(ctx); DisposeWindow(window); } -void Darwin$GLCarbonSurface::natBlit(Darwin$GLCarbonDoubleBuffer *db, jint sx1, jint sy1, jint dx1, jint dy1, jint dx2, jint dy2) { +void Darwin$GLCarbonSurface::natBlit(Darwin$GLCarbonPixelBuffer *db, jint sx1, jint sy1, jint dx1, jint dy1, jint dx2, jint dy2) { AGLContext ctx = (AGLContext) rawCTX; int sx2 = sx1 + (dx2-dx1); int sy2 = sy1 + (dy2-dy1);