vcl/inc/osx/salinst.h | 1 -
vcl/osx/salinst.cxx | 4 +++-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 0f836296ea3cdc10326ad54983b634168285b8e2
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue May 20 23:34:02 2014 +0300
Don't use two separate names for the same thing
Change-Id: Iad76d452d5dbaa03099c1a649d7f278b0151f340
diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 6d9a8d6..8a88a26 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -147,7 +147,6 @@ public:
static const short AppExecuteSVMain = 0x7fff;
static const short AppEndLoopEvent = 1;
static const short AppStartTimerEvent = 10;
- static const short AppleRemoteEvent = 15;
static const short YieldWakeupEvent = 20;
static NSMenu* GetDynamicDockMenu();
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 2fce74c..b779109 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -475,7 +475,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
break;
#if !HAVE_FEATURE_MACOSX_SANDBOX
- case AppleRemoteEvent:
+ case AppleRemoteControlEvent: // Defined in
<apple_remote/RemoteMainController.h>
{
sal_Int16 nCommand = 0;
SalData* pSalData = GetSalData();
commit c41ad388af65863b89788f874031cb129ce0f8b2
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue May 20 23:32:00 2014 +0300
We don't support the Apple Remote in sandboxed mode
Change-Id: Ie0a456647376b9d249850227d3481be5b4ee991d
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 7b10141..2fce74c 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -474,6 +474,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
}
break;
+#if !HAVE_FEATURE_MACOSX_SANDBOX
case AppleRemoteEvent:
{
sal_Int16 nCommand = 0;
@@ -536,6 +537,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent*
pEvent )
}
break;
+#endif
case YieldWakeupEvent:
// do nothing, fall out of Yield
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
