diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-22 18:27:19 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-22 22:02:08 +0300 |
| commit | 4fe9ef81aa83403bd3b7df555ccbd96cbdfd7c2d (patch) | |
| tree | 6f76e82a3c0638d831b07f0da6c32847e4676c30 /vcl/aqua/source | |
| parent | 680ff754db8d7541877b35bb8596e96db5c8ea27 (diff) | |
The AppleRemote code is blocked by sandboxing so bypass it in that case
Change-Id: I0e86c82fb81732468cf0a60eb8ff1d0579986767
Diffstat (limited to 'vcl/aqua/source')
| -rw-r--r-- | vcl/aqua/source/app/saldata.cxx | 5 | ||||
| -rw-r--r-- | vcl/aqua/source/app/salinst.cxx | 4 | ||||
| -rw-r--r-- | vcl/aqua/source/app/vclnsapp.mm | 6 |
3 files changed, 12 insertions, 3 deletions
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 185dd0b59c4a..4ec95066e2fe 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include "aqua/saldata.hxx" #include "aqua/salnsmenu.h" @@ -47,7 +48,9 @@ SalData::SalData() mxP50Pattern( NULL ), maCursors( POINTER_COUNT, INVALID_CURSOR_PTR ), mbIsScrollbarDoubleMax( false ), +#if !HAVE_FEATURE_MACOSX_SANDBOX mpMainController( NULL ), +#endif mpDockIconClickHandler( nil ), mnDPIX( 0 ), mnDPIY( 0 ) @@ -82,8 +85,10 @@ SalData::~SalData() osl_destroyThreadKey( s_aAutoReleaseKey ); s_aAutoReleaseKey = 0; } +#if !HAVE_FEATURE_MACOSX_SANDBOX if ( mpMainController ) [mpMainController release]; +#endif } void SalData::ensureThreadAutoreleasePool() diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 89ce263b3690..999a19f77ce1 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> #include <stdio.h> @@ -167,7 +168,7 @@ static void initNSApp() selector: @selector(scrollbarSettingsChanged:) name: @"AppleNoRedisplayAppearancePreferenceChanged" object: nil ]; - +#if !HAVE_FEATURE_MACOSX_SANDBOX // Initialize Apple Remote GetSalData()->mpMainController = [[MainController alloc] init]; @@ -180,6 +181,7 @@ static void initNSApp() selector: @selector(applicationWillResignActive:) name: @"AppleRemoteWillResignActive" object: nil ]; +#endif } sal_Bool ImplSVMainHook( int * pnInit ) diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index e211642d91ae..738db9e252a6 100644 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "sal/config.h" #include <vector> @@ -439,8 +441,7 @@ // for Apple Remote implementation -#pragma mark - -#pragma mark NSApplication Delegates +#if !HAVE_FEATURE_MACOSX_SANDBOX - (void)applicationWillBecomeActive:(NSNotification *)pNotification { (void)pNotification; @@ -490,6 +491,7 @@ [(*it)->mpWindow setLevel: NSNormalWindowLevel]; } } +#endif - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { |