From f586e3e7872c6323bb8ee56fc0d5fc82f349fb6e Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Mon, 17 Oct 2011 08:34:02 +0000 Subject: [PATCH] * 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 --- ChangeLog | 7 ++++++- Source/GSXibLoader.m | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ca5dc9e4..da41990e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2011-10-11 Fred Kiefer +2011-10-17 Fred Kiefer + + * Source/GSXibLoader.m (-objectForXib:): Add type "real" and + handle empty strings. + +2011-10-15 Fred Kiefer * Source/NSScrollView.m (-encodeWithCoder:, -initWithCoder:): Correct keyed encoding and decoding of flags. NIB files created diff --git a/Source/GSXibLoader.m b/Source/GSXibLoader.m index 022cfa91d..abf84b39f 100644 --- a/Source/GSXibLoader.m +++ b/Source/GSXibLoader.m @@ -952,6 +952,10 @@ didStartElement: (NSString *)elementName encoding: NSUTF8StringEncoding]); } + // empty strings are not nil! + if (new == nil) + new = @""; + if (key != nil) [decoded setObject: new forKey: key]; @@ -961,6 +965,15 @@ didStartElement: (NSString *)elementName { 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) [decoded setObject: new forKey: key];