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

* Source/GSXib5KeyedUnarchiver.m: Clean up NSPathCell decoding.

Browse source
This commit is contained in:
fredkiefer 2020-05-10 21:52:13 +02:00
parent 8162d07536
commit 981227145e
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2020-05-10 Fred Kiefer <FredKiefer@gmx.de>
* Source/GSXib5KeyedUnarchiver.m: Clean up NSPathCell decoding.
2020-05-09 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSStringDrawing.m: Initialize all the cache entries as

11
Source/GSXib5KeyedUnarchiver.m
View file

@ -48,7 +48,6 @@
#import "AppKit/NSNib.h"
#import "AppKit/NSParagraphStyle.h"
#import "AppKit/NSPathCell.h"
#import "AppKit/NSPathComponentCell.h"
#import "AppKit/NSPopUpButton.h"
#import "AppKit/NSPopUpButtonCell.h"
#import "AppKit/NSScroller.h"
@ -157,10 +156,6 @@ static NSString *ApplicationClass = nil;
@end
@interface NSPathCell (Private)
+ (NSArray *) _generateCellsForURL: (NSURL *)url;
@end
@implementation GSXib5KeyedUnarchiver
static NSDictionary *XmlTagToObjectClassMap = nil;
@ -212,6 +207,7 @@ static NSArray *XmlBoolDefaultYes = nil;
@"NSWindowTemplate", @"window",
@"NSView", @"tableCellView",
@"IBUserDefinedRuntimeAttribute5", @"userDefinedRuntimeAttribute",
@"NSURL", @"url",
nil];
RETAIN(XmlTagToObjectClassMap);
@ -279,6 +275,7 @@ static NSArray *XmlBoolDefaultYes = nil;
@"implicitItemIdentifier", @"NSToolbarItemIdentifier",
@"bordered", @"NSIsBordered",
@"altersStateOfSelectedItem", @"NSAltersState",
@"string", @"NS.relative",
nil];
RETAIN(XmlKeyMapTable);
@ -2202,8 +2199,7 @@ didStartElement: (NSString*)elementName
}
else if ([class isSubclassOfClass: [NSPathCell class]])
{
GSXibElement *el = [element elementForKey: @"url"];
object = [NSURL URLWithString: [el attributeForKey: @"string"]];
object = [self decodeObjectForKey: @"url"];
}
else
{
@ -3204,7 +3200,6 @@ didStartElement: (NSString*)elementName
{
hasValue = [currentElement attributeForKey: @"title"] != nil;
hasValue |= [currentElement attributeForKey: @"image"] != nil;
hasValue |= [currentElement attributeForKey: @"string"] != nil;
}
else if ([@"NSControlContents" isEqualToString: key])
{