diff --git a/ChangeLog b/ChangeLog index 7a7834b7c..ded2e95ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-10-06 Fred Kiefer + + * Source/NSProgressIndicator.m (-encodeWithCoder:, initWithCoder:) + The flag isDisplayedWhenStopped is stored negated. + 2011-10-04 Fred Kiefer * Headers/AppKit/NSBezierPath.h, @@ -943,7 +948,7 @@ Turn release messages sent to autorelease pools into drain messages. No functionality change in non-GC mode, in GC mode it invokes a quick GC pass to try to delete the short-lived objects. - + Also deleted some [pool release] lines just before exit() or return-from-main statements. These cause objects to be swapped in and destructors to be run to no benefit (the OS will reclaim this memory diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m index e31414e68..c5ceafe2f 100644 --- a/Source/NSProgressIndicator.m +++ b/Source/NSProgressIndicator.m @@ -385,7 +385,7 @@ flags |= 8; flags |= (_controlSize == NSSmallControlSize) ? 0x100 : 0; flags |= (_style == NSProgressIndicatorSpinningStyle) ? 0x1000 : 0; - flags |= _isDisplayedWhenStopped ? 0x2000 : 0; + flags |= _isDisplayedWhenStopped ? 0 : 0x2000; [aCoder encodeInt: flags forKey: @"NSpiFlags"]; // things which Gorm encodes, but IB doesn't care about. @@ -447,7 +447,7 @@ _controlSize = (flags & 0x100) ? NSSmallControlSize : NSRegularControlSize; [self setStyle: (flags & 0x1000) ? NSProgressIndicatorSpinningStyle : NSProgressIndicatorBarStyle]; - _isDisplayedWhenStopped = ((flags & 0x2000) == 0x2000); + _isDisplayedWhenStopped = ((flags & 0x2000) != 0x2000); // ignore the rest, since they are not pertinent to GNUstep. } else