diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:50:24 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:50:24 +0000 |
| commit | 7479f74b9074aaa24e16976d19224ddd210b5869 (patch) | |
| tree | 3a9f923be0e5fb01d2486aacf95d39d5798c87c4 /vcl/source/window | |
| parent | d532c545d1dcf5e7d9031a05f463f50a490f6c37 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.10.80); FILE MERGED
2007/10/26 08:29:17 pl 1.10.80.2: #i82621# change java child handle interface to sal_IntPtr
2007/10/15 11:11:26 pl 1.10.80.1: #i82621# initial implementation of SalObject for MacOSX aqua
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/javachild.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx index 955cca36c315..1d2e304cf85d 100644 --- a/vcl/source/window/javachild.cxx +++ b/vcl/source/window/javachild.cxx @@ -4,9 +4,9 @@ * * $RCSfile: javachild.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2007-07-24 10:20:37 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:50:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -128,14 +128,15 @@ void JavaChildWindow::implTestJavaException( void* pEnv ) // ----------------------------------------------------------------------- -sal_Int32 JavaChildWindow::getParentWindowHandleForJava() +sal_IntPtr JavaChildWindow::getParentWindowHandleForJava() { - sal_Int32 nRet = 0; + sal_IntPtr nRet = 0; #if defined WNT - nRet = reinterpret_cast< sal_Int32 >( GetSystemData()->hWnd ); + nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd ); #elif defined QUARTZ - nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->rWindow ); + // FIXME: this is wrong + nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView ); #elif defined UNX #ifdef SOLAR_JAVA uno::Reference< lang::XMultiServiceFactory > xFactory( vcl::unohelper::GetMultiServiceFactory() ); @@ -200,14 +201,14 @@ sal_Int32 JavaChildWindow::getParentWindowHandleForJava() GetSystemData()->aWindow, 0, 0, aSize.Width(), aSize.Height() ); implTestJavaException(pEnv); - nRet = static_cast< sal_Int32 >( ji_widget ); + nRet = static_cast< sal_IntPtr >( ji_widget ); } catch( uno::RuntimeException& ) { } if( !nRet ) - nRet = static_cast< sal_Int32 >( GetSystemData()->aWindow ); + nRet = static_cast< sal_IntPtr >( GetSystemData()->aWindow ); } } catch( ... ) |