gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 14:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

GSModelLoaderFact, GSServicesManager and GSTextStorage merges

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38699 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-06-26 16:41:14 +00:00
parent dc754ea0a5
commit f9ebfcb1cf
3 changed files with 57 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/GSServicesManager.m
View file

@ -577,17 +577,24 @@ static NSString *disabledName = @".GNUstepDisabled";
{
id del = [NSApp delegate];
BOOL result = NO;
NSError *err = nil;
if ([del respondsToSelector: _cmd])
{
result = [del application: theApp openFile: file];
}
else if ([[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfFile: file display: YES] != nil)
openDocumentWithContentsOfURL: [NSURL fileURLWithPath: file]
display: YES
error: &err] != nil)
{
[NSApp activateIgnoringOtherApps: YES];
result = YES;
}
else
{
[NSApp presentError: err];
}
return result;
}
@ -618,13 +625,16 @@ static NSString *disabledName = @".GNUstepDisabled";
{
id del = [NSApp delegate];
BOOL result = NO;
NSError *err = nil;
if ([del respondsToSelector: _cmd])
{
result = [del application: theApp openFileWithoutUI: file];
}
else if ([[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfFile: file display: NO] != nil)
openDocumentWithContentsOfURL: [NSURL fileURLWithPath: file]
display: NO
error: &err] != nil)
{
result = YES;
}
@ -646,13 +656,16 @@ static NSString *disabledName = @".GNUstepDisabled";
{
id del = [NSApp delegate];
BOOL result = NO;
NSError *err = nil;
if ([del respondsToSelector: _cmd])
{
result = [del application: theApp openURL: aURL];
}
else if ([[NSDocumentController sharedDocumentController]
openDocumentWithContentsOfURL: aURL display: YES] != nil)
openDocumentWithContentsOfURL: aURL
display: YES
error: &err] != nil)
{
[NSApp activateIgnoringOtherApps: YES];
result = YES;