Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocoa-seems-to-work

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@173503 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2005-05-17 04:38:38 +00:00
parent db61e09837
commit 79fb88819e
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/java/webclient/src_moz/Makefile.in
View File

@@ -136,7 +136,8 @@ ifeq ($(OS_ARCH),Darwin)
CMMSRCS = cocoa/CocoaBrowserControlCanvas.mm
CPPSRCS += cocoa/CocoaBrowserControlCanvasImpl.cpp
DLL_SUFFIX = .jnilib
DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljawt
#DSO_LDOPTS += -L/System/Library/Frameworks/JavaVM.Framework/Libraries -ljawt
DSO_LDOPTS += -framework JavaVM -lobjc
else
ifeq ($(OS_ARCH),WINNT)
CPPSRCS += \

14
mozilla/java/webclient/src_moz/cocoa/CocoaBrowserControlCanvas.mm
View File

@@ -29,6 +29,8 @@
#include <assert.h>
#import <Cocoa/Cocoa.h>
#include "CocoaBrowserControlCanvas.h"
#include "jni_util.h" //for throwing Exceptions to Java
@@ -42,6 +44,8 @@ jint CocoaBrowserControlCanvas::cocoaGetHandleToPeer(JNIEnv *env, jobject canvas
jboolean result = JNI_FALSE;
jint lock = 0;
NSView *view = NULL;
NSWindow *win = NULL;
void * windowPtr = NULL;
printf("debug: edburns: about to get AWT\n");
// get the AWT
@@ -98,6 +102,14 @@ jint CocoaBrowserControlCanvas::cocoaGetHandleToPeer(JNIEnv *env, jobject canvas
// Get the corresponding peer from the caller canvas
view = dsi_mac->cocoaViewRef;
printf("debug: edburns: view: %p\n", view);
fflush(stdout);
win = [view window];
printf("debug: edburns: win: %p\n", win);
fflush(stdout);
windowPtr = [win windowRef];
printf("debug: edburns: windowPtr: %p\n", windowPtr);
fflush(stdout);
// Free the DrawingSurfaceInfo
ds->FreeDrawingSurfaceInfo(dsi);
}
@@ -109,5 +121,5 @@ jint CocoaBrowserControlCanvas::cocoaGetHandleToPeer(JNIEnv *env, jobject canvas
// Free the drawing surface (if not caching it)
awt.FreeDrawingSurface(ds);
return (jint) view;
return (jint) windowPtr;
}