diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:40:01 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:40:01 +0000 |
commit | 4b62e4276ce5b239c728eb5f556b516e37f4a1a6 (patch) | |
tree | f0042df6a37068c3ecb147816832132b211c1738 /toolkit/source/awt/vclxtopwindow.cxx | |
parent | 5f970455bd219ade1e7051fc75647240a5c8336c (diff) |
INTEGRATION: CWS macosxquicktime01 (1.9.42); FILE MERGED
2007/10/26 08:29:45 pl 1.9.42.1: #i82621# changed SystemEnvData and SystemParentData for QUARTZ
Diffstat (limited to 'toolkit/source/awt/vclxtopwindow.cxx')
-rw-r--r-- | toolkit/source/awt/vclxtopwindow.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx index 77f804aeebdc..751ca08527a0 100644 --- a/toolkit/source/awt/vclxtopwindow.cxx +++ b/toolkit/source/awt/vclxtopwindow.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxtopwindow.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2007-11-02 12:14:37 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:40:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,12 @@ #include <tools/postwin.h> #endif +#ifdef QUARTZ +#include "premac.h" +#include <Cocoa/Cocoa.h> +#include "postmac.h" +#endif + #include <vcl/syschild.hxx> #include <vcl/sysdata.hxx> #include <cppuhelper/typeprovider.hxx> @@ -192,7 +198,7 @@ VCLXTopWindow::~VCLXTopWindow() #elif (defined QUARTZ) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { - aRet <<= (sal_IntPtr)pSysData->rWindow; + aRet <<= (sal_IntPtr)pSysData->pView; } #elif (defined UNX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW ) |