summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-01-11 11:07:23 +0200
committerTor Lillqvist <tml@iki.fi>2013-01-11 11:16:59 +0200
commite103887c8c158e7059a586ef5a5f7b234c547dfe (patch)
tree6cbcabd6d270e595578cc283afadd5b4023bd718 /extensions
parent4d23222b15ac0034e265441c71405a48403721f8 (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 'extensions')
-rw-r--r--extensions/source/plugin/base/nfuncs.cxx10
-rw-r--r--extensions/source/plugin/base/xplugin.cxx6
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx4
3 files changed, 10 insertions, 10 deletions
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index b37a1c94d9df..7e48f9b45761 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -563,7 +563,7 @@ NPError SAL_CALL NP_LOADDS NPN_GetValue( NPP instance, NPNVariable variable, vo
default:
aResult = NPERR_INVALID_PARAM;
break;
- #ifdef QUARTZ
+ #ifdef MACOSX
case 2000: // NPNVsupportsQuickDrawBool
*(NPBool*)value = false;
break;
@@ -600,7 +600,7 @@ NPError SAL_CALL NP_LOADDS NPN_SetValue( NPP instance,
{
NPError nError = NPERR_NO_ERROR;
TRACEN( "NPN_SetValue ", variable );
- #ifdef QUARTZ
+ #ifdef MACOSX
NPN_SetValue_Impl(instance, variable, value);
#else
(void)instance;
@@ -614,7 +614,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRect(NPP instance, NPRect* /*invalidRect*
{
TRACE( "NPN_InvalidateRect" );
- #ifdef QUARTZ
+ #ifdef MACOSX
NPN_ForceRedraw( instance );
#else
(void)instance;
@@ -625,7 +625,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRegion(NPP instance, NPRegion /*invalidRe
{
TRACE( "NPN_InvalidateRegion" );
- #ifdef QUARTZ
+ #ifdef MACOSX
NPN_ForceRedraw( instance );
#else
(void)instance;
@@ -635,7 +635,7 @@ void SAL_CALL NP_LOADDS NPN_InvalidateRegion(NPP instance, NPRegion /*invalidRe
void SAL_CALL NP_LOADDS NPN_ForceRedraw(NPP instance)
{
TRACE( "NPN_ForceRedraw" );
- #ifdef QUARTZ
+ #ifdef MACOSX
NPN_ForceRedraw_Impl(instance);
#else
(void)instance;
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index 6ad9b2cb3784..ea77d38fd18c 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -523,7 +523,7 @@ void XPlugin_Impl::loadPlugin()
}
}
const SystemEnvData* pEnvData = getSysChildSysData();
-#if defined( UNX ) && !(defined(QUARTZ))
+#if defined( UNX ) && !(defined(MACOSX))
if (pEnvData->pDisplay) // headless?
{
XSync( (Display*)pEnvData->pDisplay, False );
@@ -533,7 +533,7 @@ void XPlugin_Impl::loadPlugin()
{
if( !m_aDescription.PluginName.isEmpty() )
{
-#if defined QUARTZ
+#if defined MACOSX
PluginComm* pComm = new MacPluginComm( m_aDescription.Mimetype,
m_aDescription.PluginName,
pEnvData->pView );
@@ -568,7 +568,7 @@ void XPlugin_Impl::loadPlugin()
(char**)(m_nArgs ? m_pArgn : NULL),
(char**)(m_nArgs ? m_pArgv : NULL),
NULL );
-#ifdef QUARTZ
+#ifdef MACOSX
// m_aNPWindow is set up in the MacPluginComm from the view
SetSysPlugDataParentView(*pEnvData);
#elif defined( UNX )
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index dbb06a06be67..e50853d9296f 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -73,7 +73,7 @@
#ifdef WNT
#include <plugin/win/sysplug.hxx>
-#elif defined(QUARTZ)
+#elif defined(MACOSX)
#include "plugin/aqua/sysplug.hxx"
#elif defined(UNX)
#include "plugin/unx/sysplug.hxx"
@@ -152,7 +152,7 @@ private:
sal_Bool m_bIsDisposed;
-#ifdef QUARTZ
+#ifdef MACOSX
void SetSysPlugDataParentView(SystemEnvData const& rEnvData);
#endif