diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:46:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:46:48 +0000 |
| commit | 04934f11a925dbf2ba88463efe67469b807097fe (patch) | |
| tree | b4e37b3d7116f63302d922071d2fc4e5aa4e557d /sj2 | |
| parent | c1034f87c7eaf78f6dff26836dc9527ac8273d71 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.29.8); FILE MERGED
2007/10/26 09:16:56 pl 1.29.8.1: #i82621# changed SystemEnvData and SystemParentData for QUARTZ
Diffstat (limited to 'sj2')
| -rw-r--r-- | sj2/source/jscpp/sjapplet_impl.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sj2/source/jscpp/sjapplet_impl.cxx b/sj2/source/jscpp/sjapplet_impl.cxx index 86d7704acd1b..68f50d6f7b0b 100644 --- a/sj2/source/jscpp/sjapplet_impl.cxx +++ b/sj2/source/jscpp/sjapplet_impl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sjapplet_impl.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: hr $ $Date: 2007-11-02 12:21:02 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:46:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,6 +48,12 @@ #include <svtools/ownlist.hxx> +#ifdef QUARTZ +#include "premac.h" +#include <Cocoa/Cocoa.h> +#include "postmac.h" +#endif + #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> @@ -217,14 +223,16 @@ EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) th /* The WNT code (above) that this code derives from, may be using quite old ways of interacting with native windows. More modern approaches seems to point towards JAWT_* and com.apple.eawt */ - +#if 0 +// FIXME: this is not going to work on cocoa jclass jcFrame = pEnv->FindClass("apple/awt/CEmbeddedFrame"); testJavaException(pEnv); jmethodID jmFrame_rinit = pEnv->GetMethodID(jcFrame, "<init>", "(I)V"); testJavaException(pEnv); jobject joFrame = pEnv->AllocObject(jcFrame); testJavaException(pEnv); -pEnv->CallVoidMethod(joFrame, jmFrame_rinit, (jint)pEnvData->rWindow); testJavaException(pEnv); +pEnv->CallVoidMethod(joFrame, jmFrame_rinit, (jint)pEnvData->pView); testJavaException(pEnv); _joWindow = pEnv->NewGlobalRef(joFrame); +#endif } #else |