From e70a5cde239e7f4ba10b99ec48423efc33309476 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Wed, 15 Dec 1999 17:16:40 +0000 Subject: [PATCH] Encoding/decoding fixes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5522 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSButtonCell.m | 19 ++++++++++++++++++- Source/NSCell.m | 4 ++++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ffb99706c..316d8d0d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 15 17:15:00 1999 Richard Frith-Macdonald + + * Source/NSCell.m: encode/decode some missing ivars. + * Source/NSButtonCell.m: encode/decode some missing ivars. + Wed Dec 15 15:25:00 1999 Richard Frith-Macdonald * Source/NSWindow.m: ([-setFrameAutosaveName:]) bugfix for setting a diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m index efa93903f..b1461f5f3 100644 --- a/Source/NSButtonCell.m +++ b/Source/NSButtonCell.m @@ -746,12 +746,21 @@ [super encodeWithCoder: aCoder]; NSDebugLog(@"NSButtonCell: start encoding\n"); + [aCoder encodeObject: _keyEquivalent]; [aCoder encodeObject: _keyEquivalentFont]; [aCoder encodeObject: _altContents]; [aCoder encodeObject: _altImage]; tmp = _buttoncell_is_transparent; - [aCoder encodeValueOfObjCType: @encode(BOOL) at: &tmp]; + [aCoder encodeValueOfObjCType: @encode(BOOL) + at: &tmp]; + [aCoder encodeValueOfObjCType: @encode(unsigned int) + at: &_keyEquivalentModifierMask]; + [aCoder encodeValueOfObjCType: @encode(unsigned int) + at: &_highlightsByMask]; + [aCoder encodeValueOfObjCType: @encode(unsigned int) + at: &_showAltStateMask]; + NSDebugLog(@"NSButtonCell: finish encoding\n"); } @@ -761,12 +770,20 @@ [super initWithCoder: aDecoder]; NSDebugLog(@"NSButtonCell: start decoding\n"); + [aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalentFont]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_altContents]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_altImage]; [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &tmp]; _buttoncell_is_transparent = tmp; + [aDecoder decodeValueOfObjCType: @encode(unsigned int) + at: &_keyEquivalentModifierMask]; + [aDecoder decodeValueOfObjCType: @encode(unsigned int) + at: &_highlightsByMask]; + [aDecoder decodeValueOfObjCType: @encode(unsigned int) + at: &_showAltStateMask]; + NSDebugLog(@"NSButtonCell: finish decoding\n"); return self; diff --git a/Source/NSCell.m b/Source/NSCell.m index b899c7418..6a8e130ca 100644 --- a/Source/NSCell.m +++ b/Source/NSCell.m @@ -1200,6 +1200,8 @@ static NSColor *shadowCol; [aCoder encodeValueOfObjCType: @encode(unsigned int) at: &tmp_int]; tmp_int = _cell.entry_type; [aCoder encodeValueOfObjCType: @encode(unsigned int) at: &tmp_int]; + [aCoder encodeValueOfObjCType: @encode(unsigned int) at: &_action_mask]; + [aCoder encodeValueOfObjCType: @encode(id) at: &_represented_object]; } - (id) initWithCoder: (NSCoder*)aDecoder @@ -1240,6 +1242,8 @@ static NSColor *shadowCol; _cell.text_align = tmp_int; [aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &tmp_int]; _cell.entry_type = tmp_int; + [aDecoder decodeValueOfObjCType: @encode(unsigned int) at: &_action_mask]; + [aDecoder decodeValueOfObjCType: @encode(id) at: &_represented_object]; return self; }