QUARTZ is equivalent to MACOSX

So just check MACOSX in the sources, and don't pass any -DQUARTZ to
compilations.

Change-Id: Ia1de6024810f81f1eea01b8eb0b885d9d1ee8e20

4 files changed, 11 insertions, 11 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;
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 38960e2aa06e..527188b0efdb 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -47,7 +47,7 @@
 #include <rtl/uuid.h>
 #include <rtl/process.h>
 
-#ifdef QUARTZ
+#ifdef MACOSX
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
@@ -129,7 +129,7 @@ using org::libreoffice::touch::ByteBufferWrapper;
 
 #if (defined WNT)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_WIN32
-#elif (defined QUARTZ)
+#elif (defined MACOSX)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_MAC
 #elif (defined UNX)
 #define SYSTEM_DEPENDENT_TYPE ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW
@@ -939,7 +939,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                                 {
                                     SystemParentData aParentData;
                                     aParentData.nSize   = sizeof( aParentData );
-                                    #if defined QUARTZ
+                                    #if defined MACOSX
                                     aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
                                     #elif defined IOS
                                     aParentData.pView   = reinterpret_cast<UIView*>(nWindowHandle);
@@ -1186,7 +1186,7 @@ css::uno::Reference< css::awt::XWindowPeer > VCLXToolkit::ImplCreateWindow(
         {
             SystemParentData aParentData;
             aParentData.nSize   = sizeof( aParentData );
-            #if defined QUARTZ
+            #if defined MACOSX
             aParentData.pView   = reinterpret_cast<NSView*>(nWindowHandle);
             #elif defined IOS
             aParentData.pView   = reinterpret_cast<UIView*>(nWindowHandle);
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 462a5682184d..dc80565b1eaa 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/awt/SystemDependentXWindow.hpp>
 
-#if defined ( QUARTZ )
+#if defined ( MACOSX )
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
@@ -97,7 +97,7 @@ Sequence< Type > VCLXTopWindow_Base::getTypes() throw(RuntimeException)
             {
                  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;
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);