mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS aquavcl01 (1.26.12); FILE MERGED

Browse Source 
2007/04/11 07:51:18 pjanik 1.26.12.5: RESYNC: (1.27-1.28); FILE MERGED
2006/12/31 13:48:09 mox 1.26.12.4: Issue number:  #i72385#
Apply a better guess at jave interface for quartz.
Mimicking the solution in canvas/source/java/aqua/WindowAdapter.java
2006/12/30 19:40:11 pjanik 1.26.12.3: #i72385#: Add Quartz/AQUA specific part.
2006/07/19 08:12:23 pjanik 1.26.12.2: RESYNC: (1.26-1.27); FILE MERGED
2006/01/31 01:00:22 fheckl 1.26.12.1: Allowing a full aqua build
This commit is contained in:
Rüdiger Timm
2007-07-05 07:06:56 +00:00
parent f84d70d757
commit 81ebc5c349
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sj2/source/jscpp/sjapplet_impl.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: sjapplet_impl.cxx,v $ * $RCSfile: sjapplet_impl.cxx,v $
* *
* $Revision: 1.28 $ * $Revision: 1.29 $
* *
* last change: $Author: obo $ $Date: 2007-03-12 10:46:39 $ * last change: $Author: rt $ $Date: 2007-07-05 08:06:56 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -58,7 +58,7 @@
#include "com/sun/star/uno/XComponentContext.hpp" #include "com/sun/star/uno/XComponentContext.hpp"
#include "jvmaccess/classpath.hxx" #include "jvmaccess/classpath.hxx"
#ifdef UNX #if defined(UNX) && !defined(QUARTZ)
#define Time xlib_time #define Time xlib_time
#define Window xlib_window #define Window xlib_window
#define Font xlib_font #define Font xlib_font
@@ -116,7 +116,7 @@ static void throwException() throw(com::sun::star::uno::RuntimeException)
#endif #endif
#ifdef SOLAR_JAVA #ifdef SOLAR_JAVA
#ifdef UNX #if defined (UNX) && !defined(QUARTZ)
struct EmbeddedWindow { struct EmbeddedWindow {
jobject _joWindow; jobject _joWindow;
@@ -189,7 +189,7 @@ EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData)
#endif #endif
} }
#else #else // UNX && !QUARTZ
struct EmbeddedWindow { struct EmbeddedWindow {
jobject _joWindow; jobject _joWindow;
@@ -211,6 +211,22 @@ pEnv->CallVoidMethod(joFrame, jmFrame_rinit, (jint)pEnvData->hWnd); testJava
_joWindow = pEnv->NewGlobalRef(joFrame); _joWindow = pEnv->NewGlobalRef(joFrame);
} }
#elif defined QUARTZ
EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException)
{
/* 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 */
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);
_joWindow = pEnv->NewGlobalRef(joFrame);
}
#else #else
EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException) EmbeddedWindow::EmbeddedWindow(JNIEnv * pEnv, SystemEnvData const * pEnvData) throw(com::sun::star::uno::RuntimeException)
@@ -225,7 +241,7 @@ _joWindow = pEnv->NewGlobalRef(joFrame);
#endif #endif
#endif #endif // UNX && !QUARTZ
void EmbeddedWindow::dispose(JNIEnv * pEnv) void EmbeddedWindow::dispose(JNIEnv * pEnv)
{ {