mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-06-02 11:00:59 +00:00
* Source/GSXibLoader.m (-objectForXib:): Add type "real" and
handle empty strings. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34011 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
2653212909
commit
f586e3e787
2 changed files with 19 additions and 1 deletions
|
@ -1,4 +1,9 @@
|
||||||
2011-10-11 Fred Kiefer <FredKiefer@gmx.de>
|
2011-10-17 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
|
* Source/GSXibLoader.m (-objectForXib:): Add type "real" and
|
||||||
|
handle empty strings.
|
||||||
|
|
||||||
|
2011-10-15 Fred Kiefer <FredKiefer@gmx.de>
|
||||||
|
|
||||||
* Source/NSScrollView.m (-encodeWithCoder:, -initWithCoder:):
|
* Source/NSScrollView.m (-encodeWithCoder:, -initWithCoder:):
|
||||||
Correct keyed encoding and decoding of flags. NIB files created
|
Correct keyed encoding and decoding of flags. NIB files created
|
||||||
|
|
|
@ -952,6 +952,10 @@ didStartElement: (NSString *)elementName
|
||||||
encoding: NSUTF8StringEncoding]);
|
encoding: NSUTF8StringEncoding]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// empty strings are not nil!
|
||||||
|
if (new == nil)
|
||||||
|
new = @"";
|
||||||
|
|
||||||
if (key != nil)
|
if (key != nil)
|
||||||
[decoded setObject: new forKey: key];
|
[decoded setObject: new forKey: key];
|
||||||
|
|
||||||
|
@ -961,6 +965,15 @@ didStartElement: (NSString *)elementName
|
||||||
{
|
{
|
||||||
id new = [NSNumber numberWithInt: [[element value] intValue]];
|
id new = [NSNumber numberWithInt: [[element value] intValue]];
|
||||||
|
|
||||||
|
if (key != nil)
|
||||||
|
[decoded setObject: new forKey: key];
|
||||||
|
|
||||||
|
return new;
|
||||||
|
}
|
||||||
|
else if ([@"real" isEqualToString: elementName])
|
||||||
|
{
|
||||||
|
id new = [NSNumber numberWithFloat: [[element value] floatValue]];
|
||||||
|
|
||||||
if (key != nil)
|
if (key != nil)
|
||||||
[decoded setObject: new forKey: key];
|
[decoded setObject: new forKey: key];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue