gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-22 17:52:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into document-nswindowcontroller

Browse source
This commit is contained in:
Fred Kiefer 2018-05-28 02:56:25 -04:00 committed by GitHub
commit 584adbd401
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -2,6 +2,11 @@
* Source/NSWindowController.m: gsdoc
2018-03-30 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSDocument.m (-revertToContentsOfURL:ofType:error:): Add
override calls for deprecated methods.
2018-03-11 Fred Kiefer <FredKiefer@gmx.de>
* Headers/AppKit/NSSliderCell.h,

8
Source/NSDocument.m
View file

@ -788,6 +788,14 @@ withContentsOfURL: (NSURL *)url
ofType: (NSString *)type
error: (NSError **)error
{
if (OVERRIDDEN(revertToSavedFromURL:ofType:))
{
return [self revertToSavedFromURL: url ofType: type];
}
if (OVERRIDDEN(revertToSavedFromFile:ofType:) && [url isFileURL])
{
return [self revertToSavedFromFile:[url path] ofType: type];
}
return [self readFromURL: url
ofType: type
error: error];