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/vclxsystemdependentwindow.cxx | |
| parent | 4d23222b15ac0034e265441c71405a48403721f8 (diff) | |
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/vclxsystemdependentwindow.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxsystemdependentwindow.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx index 7b26d7877bf3..d05eacfe0954 100644 --- a/toolkit/source/awt/vclxsystemdependentwindow.cxx +++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx @@ -19,7 +19,7 @@ #include <com/sun/star/lang/SystemDependent.hpp> -#if defined UNX && ! defined QUARTZ && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ +#if defined UNX && ! defined MACOSX && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_ #include <com/sun/star/awt/SystemDependentXWindow.hpp> #endif @@ -27,7 +27,7 @@ #include <toolkit/helper/macros.hxx> #include <cppuhelper/typeprovider.hxx> -#ifdef QUARTZ +#ifdef MACOSX #include "premac.h" #include <Cocoa/Cocoa.h> #include "postmac.h" @@ -85,7 +85,7 @@ IMPL_XTYPEPROVIDER_END { aRet <<= (sal_Int32)pSysData->hWnd; } -#elif (defined QUARTZ) +#elif (defined MACOSX) if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC ) { aRet <<= (sal_IntPtr)pSysData->pView; |