diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:07:23 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-01-11 11:16:59 +0200 |
| commit | e103887c8c158e7059a586ef5a5f7b234c547dfe (patch) | |
| tree | 6cbcabd6d270e595578cc283afadd5b4023bd718 /toolkit/source/awt/vclxwindow1.cxx | |
| parent | Avoid crash (diff) | |
| download | core-e103887c8c158e7059a586ef5a5f7b234c547dfe.tar.gz core-e103887c8c158e7059a586ef5a5f7b234c547dfe.zip | |
QUARTZ is equivalent to MACOSX
So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.
Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20
Diffstat (limited to 'toolkit/source/awt/vclxwindow1.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxwindow1.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx index f38a95cb6dda..c937d3c035a9 100644 --- a/toolkit/source/awt/vclxwindow1.cxx +++ b/toolkit/source/awt/vclxwindow1.cxx @@ -28,7 +28,7 @@ #ifdef WNT #include <prewin.h> #include <postwin.h> -#elif defined ( QUARTZ ) +#elif defined ( MACOSX ) #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" @@ -87,7 +87,7 @@ void VCLXWindow::SetSystemParent_Impl( const com::sun::star::uno::Any& rHandle ) aSysParentData.nSize = sizeof ( SystemParentData ); #if defined( WNT ) aSysParentData.hWnd = (HWND) nHandle; -#elif defined( QUARTZ ) +#elif defined( MACOSX ) aSysParentData.pView = reinterpret_cast<NSView*>(nHandle); #elif defined( IOS ) aSysParentData.pView = reinterpret_cast<UIView*>(nHandle); |