gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix NSColorWell XBI5 decoding of NSIsBordered

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@40413 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2017-03-24 18:24:50 +00:00
parent d5242088e8
commit 19d4e2c372
1 changed files with 27 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
Source/GSXib5KeyedUnarchiver.m
View file

@ -2931,7 +2931,7 @@ didStartElement: (NSString*)elementName
[object setBezelStyle: NSRoundedBezelStyle];
#endif
}
else if (([@"NSSupport" isEqualToString: key]))
else if ([@"NSSupport" isEqualToString: key])
{
// This is the key Cocoa uses for fonts...
// OR images - depending on what's encoded
@ -2994,33 +2994,38 @@ didStartElement: (NSString*)elementName
BOOL flag = NO;
if ([super containsValueForKey:key])
{
flag = [super decodeBoolForKey:key];
}
{
flag = [super decodeBoolForKey:key];
}
else if ([@"NSIsBordered" isEqualToString: key])
{
flag = ([currentElement attributeForKey: @"bordered"] ?
[[currentElement attributeForKey: @"bordered"] boolValue] : YES);
}
else if ([XmlKeyMapTable objectForKey: key])
{
flag = [self decodeBoolForKey: [XmlKeyMapTable objectForKey: key]];
}
{
flag = [self decodeBoolForKey: [XmlKeyMapTable objectForKey: key]];
}
else if ([XmlKeyToDecoderSelectorMap objectForKey: key])
{
SEL selector = NSSelectorFromString([XmlKeyToDecoderSelectorMap objectForKey: key]);
flag = [[self performSelector: selector withObject: currentElement] boolValue];
}
{
SEL selector = NSSelectorFromString([XmlKeyToDecoderSelectorMap objectForKey: key]);
flag = [[self performSelector: selector withObject: currentElement] boolValue];
}
else if ([currentElement attributeForKey: key])
{
flag = [[currentElement attributeForKey: key] boolValue];
}
{
flag = [[currentElement attributeForKey: key] boolValue];
}
else if ([key hasPrefix:@"NS"])
{
NSString *newKey = [key stringByDeletingPrefix:@"NS"];
newKey = [[[newKey substringToIndex:1] lowercaseString] stringByAppendingString:[newKey substringFromIndex:1]];
flag = [self decodeBoolForKey:newKey];
}
{
NSString *newKey = [key stringByDeletingPrefix:@"NS"];
newKey = [[[newKey substringToIndex:1] lowercaseString] stringByAppendingString:[newKey substringFromIndex:1]];
flag = [self decodeBoolForKey:newKey];
}
#if 0
else
{
NSWarnMLog(@"no BOOL for key: %@", key);
}
{
NSWarnMLog(@"no BOOL for key: %@", key);
}
#endif
return flag;