diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:03:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-05 07:03:28 +0000 |
| commit | 03e76ca66e6ee1660cf81d66ef97f2786e313d23 (patch) | |
| tree | adb0a50a974f2aedcb1dd5bc2f3c2c3506a63deb /toolkit/source/awt/vclxsystemdependentwindow.cxx | |
| parent | cd9ffc9723d0b7c7ab9b528ce853ccf52a1ceb5e (diff) | |
INTEGRATION: CWS aquavcl01 (1.4.46); FILE MERGED
2006/12/30 19:36:28 pjanik 1.4.46.1: #i72385#: Add Quartz/AQUA specific part.
Diffstat (limited to 'toolkit/source/awt/vclxsystemdependentwindow.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 72e65da7a2ee..0511e2ae332e 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxsystemdependentwindow.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:15:11 $ + * last change: $Author: rt $ $Date: 2007-07-05 08:03:28 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -41,7 +41,7 @@ #include <com/sun/star/lang/SystemDependent.hpp> #endif -#if defined UNX && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ +#if defined UNX && ! defined QUARTZ && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ #include <com/sun/star/awt/SystemDependentXWindow.hpp> #endif @@ -95,15 +95,7 @@ IMPL_XTYPEPROVIDER_END const SystemEnvData* pSysData = ((SystemChildWindow *)pWindow)->GetSystemData(); if( pSysData ) { -#ifdef UNX - if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) - { - ::com::sun::star::awt::SystemDependentXWindow aSD; - aSD.DisplayPointer = sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(pSysData->pDisplay)); - aSD.WindowHandle = pSysData->aWindow; - aRet <<= aSD; - } -#elif (defined WNT) +#if (defined WNT) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32 ) { aRet <<= (sal_Int32)pSysData->hWnd; @@ -113,6 +105,19 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_Int32)pSysData->hWnd; } +#elif (defined QUARTZ) + if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) + { + aRet <<= (sal_IntPtr)pSysData->rWindow; + } +#elif (defined UNX) + if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) + { + ::com::sun::star::awt::SystemDependentXWindow aSD; + aSD.DisplayPointer = sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(pSysData->pDisplay)); + aSD.WindowHandle = pSysData->aWindow; + aRet <<= aSD; + } #endif } } |