Removed all ivars and cleaned up the rest.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@11034 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2001-09-28 23:37:37 +00:00
parent 4be6726ebd
commit a47397006b
7 changed files with 57 additions and 423 deletions

View file

@ -600,19 +600,16 @@ static NSImage *_pbc_image[2];
int flag;
[super encodeWithCoder: aCoder];
[aCoder encodeObject: _menu];
[aCoder encodeConditionalObject: _selectedItem];
flag = _pbcFlags.pullsDown;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.preferredEdge;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.menuIsAttached;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.usesItemFromMenu;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.altersStateOfSelectedItem;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.decoding;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
flag = _pbcFlags.arrowPosition;
[aCoder encodeValueOfObjCType: @encode(int) at: &flag];
}
@ -620,22 +617,19 @@ static NSImage *_pbc_image[2];
- (id) initWithCoder: (NSCoder*)aDecoder
{
int flag;
[super initWithCoder: aDecoder];
self = [super initWithCoder: aDecoder];
_menu = [aDecoder decodeObject];
_selectedItem = [aDecoder decodeObject];
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.pullsDown = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.preferredEdge = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.menuIsAttached = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.usesItemFromMenu = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.altersStateOfSelectedItem = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.decoding = flag;
[aDecoder decodeValueOfObjCType: @encode(int) at: &flag];
_pbcFlags.arrowPosition = flag;
return self;