gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-06-02 06:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Source/NSMenuItem.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13489 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
pyr 2002-04-17 19:57:36 +00:00
parent f47011885e
commit cc749825e7
2 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-04-17 Pierre-Yves Rivaille <pyrivail@ens-lyon.gt>
* Source/NSMenuItem.m:
([NSMenuItem -initWithCoder:], [NSMenuItem -encodeWithCoder:])
New encoding scheme. With the new scheme, menus can be loaded
properly from a gorm file.
2002-04-16 Richard Frith-Macdonald <rfm@gnu.org> 2002-04-16 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSPasteboard.m: Improve logging on server startup. * Source/NSPasteboard.m: Improve logging on server startup.

30
Source/NSMenuItem.m
View file

@ -72,7 +72,7 @@ static Class imageClass;
{ {
if (self == [NSMenuItem class]) if (self == [NSMenuItem class])
{ {
[self setVersion: 1]; [self setVersion: 2];
imageClass = [NSImage class]; imageClass = [NSImage class];
} }
} }
@ -448,15 +448,39 @@ static Class imageClass;
[aCoder encodeObject: _offStateImage]; [aCoder encodeObject: _offStateImage];
[aCoder encodeObject: _mixedStateImage]; [aCoder encodeObject: _mixedStateImage];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_changesState]; [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_changesState];
[aCoder encodeConditionalObject: _target];
[aCoder encodeValueOfObjCType: @encode(SEL) at: &_action]; [aCoder encodeValueOfObjCType: @encode(SEL) at: &_action];
[aCoder encodeValueOfObjCType: "i" at: &_tag]; [aCoder encodeValueOfObjCType: "i" at: &_tag];
[aCoder encodeConditionalObject: _representedObject]; [aCoder encodeConditionalObject: _representedObject];
[aCoder encodeObject: _submenu]; [aCoder encodeObject: _submenu];
[aCoder encodeConditionalObject: _target];
} }
- (id) initWithCoder: (NSCoder*)aDecoder - (id) initWithCoder: (NSCoder*)aDecoder
{ {
int version = [aDecoder versionForClassName:
@"NSMenuItem"];
if (version == 2)
{
[aDecoder decodeValueOfObjCType: @encode(id) at: &_title];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent];
[aDecoder decodeValueOfObjCType: "I" at: &_keyEquivalentModifierMask];
[aDecoder decodeValueOfObjCType: "I" at: &_mnemonicLocation];
[aDecoder decodeValueOfObjCType: "i" at: &_state];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_enabled];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_image];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_onStateImage];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_offStateImage];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_mixedStateImage];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_changesState];
[aDecoder decodeValueOfObjCType: @encode(SEL) at: &_action];
[aDecoder decodeValueOfObjCType: "i" at: &_tag];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_representedObject];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_submenu];
_target = [aDecoder decodeObject];
}
else
{
[aDecoder decodeValueOfObjCType: @encode(id) at: &_title]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_title];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent];
[aDecoder decodeValueOfObjCType: "I" at: &_keyEquivalentModifierMask]; [aDecoder decodeValueOfObjCType: "I" at: &_keyEquivalentModifierMask];
@ -473,7 +497,7 @@ static Class imageClass;
[aDecoder decodeValueOfObjCType: "i" at: &_tag]; [aDecoder decodeValueOfObjCType: "i" at: &_tag];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_representedObject]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_representedObject];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_submenu]; [aDecoder decodeValueOfObjCType: @encode(id) at: &_submenu];
}
return self; return self;
} }