diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:40:19 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-07 10:40:19 +0000 |
| commit | 937aaa6c7a7536f6cc83041a23ac6f045053d0c2 (patch) | |
| tree | 4109195ad9b24aa9e8807d7d964dd1cf766a3383 /toolkit/source/awt/vclxwindow1.cxx | |
| parent | 4b62e4276ce5b239c728eb5f556b516e37f4a1a6 (diff) | |
INTEGRATION: CWS macosxquicktime01 (1.7.16); FILE MERGED
2007/10/26 08:29:45 pl 1.7.16.1: #i82621# changed SystemEnvData and SystemParentData for QUARTZ
Diffstat (limited to 'toolkit/source/awt/vclxwindow1.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index 763df4bdb711..ef8c90dfe0dd 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vclxwindow1.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2007-08-30 13:54:48 $ + * last change: $Author: vg $ $Date: 2007-12-07 11:40:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,11 @@ #ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> #endif +#ifdef QUARTZ +#include "premac.h" +#include <Cocoa/Cocoa.h> +#include "postmac.h" +#endif #ifndef _SV_SYSDATA_HXX #include <vcl/sysdata.hxx> #endif @@ -103,7 +108,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) #if defined( WIN ) || defined( WNT ) || defined ( OS2 ) aSysParentData.hWnd = (HWND) nHandle; #elif defined( QUARTZ ) - aSysParentData.rWindow = (WindowRef) nHandle; + aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); #elif defined( UNX ) aSysParentData.aWindow = (long)nHandle; aSysParentData.bXEmbedSupport = bXEmbed; |