#include <org/xwt/plat/Darwin.h>
#include <org/xwt/plat/Darwin$CarbonSurface.h>
#include <org/xwt/plat/Darwin$GLCarbonSurface.h>
-#include <org/xwt/plat/Darwin$GLCarbonDoubleBuffer.h>
+#include <org/xwt/plat/Darwin$GLCarbonPixelBuffer.h>
#include <org/xwt/plat/Darwin$CarbonMessage.h>
#include <org/xwt/plat/Darwin$CarbonOpenGL.h>
#include <org/xwt/plat/Darwin$FileDialogHelper.h>
#include <org/xwt/plat/GCJ$Retainer.h>
-#include <org/xwt/Proxy.h>
+#include <org/xwt/HTTP$Proxy.h>
#include <org/xwt/util/Semaphore.h>
#include <stdlib.h>
+#include <objc/objc.h>
#include "DarwinCarbonHeaders.h"
rect.top = 0; rect.left = 0; rect.bottom = 10; rect.right=10;
r = CreateNewWindow(wc,attr,&rect,&window);
checkStatus(r,"CreateNewWindow");
+
+ id NSWindowClass = objc_getClass("NSWindow");
+ printf("nswindowclass is %x\n", NSWindowClass);
+ SEL selector = sel_registerName("initWithWindowRef");
+ printf("selector is %s\n", selector);
+ objc_method method = class_getClassMethod(NSWindowClass, selector);
+ printf("method is %x\n", method);
+ id windowInstance = objc_msgSend(NSWindowClass, selector, window);
+ printf("instance is %x\n", windowInstance);
GCJ$Retainer::retain(this); // Need to account for the EventHandlers pointer to us
EventHandlerUPP upp = NewEventHandlerUPP(our_windowEventHandler);
checkStatus(r,"PutScrapFlavor");
}
-Proxy *Darwin::natDetectProxy() {
- using org::xwt::Proxy;
- Proxy *p=0;
+HTTP$Proxy *Darwin::natDetectProxy() {
+ using org::xwt::HTTP$Proxy;
+ HTTP$Proxy *p=0;
CFStringRef string;
CFNumberRef number;
SmartCFString smartString;
number = (CFNumberRef) CFDictionaryGetValue(proxyInfo, kSCPropNetProxies ## proto ## Port); \
if(number != NULL && CFGetTypeID(number) != CFNumberGetTypeID()) number = NULL; \
if(string && number && CFNumberGetValue(number,kCFNumberIntType,&i) && i) { \
- if(!p) p = new Proxy(); \
+ if(!p) p = new HTTP$Proxy(); \
p->var ## ProxyHost = cfStringToJString(string); \
p->var ## ProxyPort = i; \
} \
checkStatus(rawSharedContext,"aglCreateContext");
}
-void Darwin$GLCarbonDoubleBuffer::natInit() {
+void Darwin$GLCarbonPixelBuffer::natInit() {
WindowClass wc = kPlainWindowClass;
WindowAttributes attr = 0;
WindowRef window;
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);