gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 17:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adopt to changed values for _keyEquivalentModifierMask.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@25380 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-08-07 15:56:03 +00:00
parent c463685ee7
commit 37a8fe73ae
3 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/NSMenuItem.m
View file

@ -73,7 +73,7 @@ static Class imageClass;
{
if (self == [NSMenuItem class])
{
[self setVersion: 3];
[self setVersion: 4];
imageClass = [NSImage class];
}
}
@ -552,19 +552,19 @@ static Class imageClass;
if ([aDecoder containsValueForKey: @"NSKeyEquivModMask"])
{
int keyMask = [aDecoder decodeIntForKey: @"NSKeyEquivModMask"];
[self setKeyEquivalentModifierMask: keyMask];
}
int keyMask = [aDecoder decodeIntForKey: @"NSKeyEquivModMask"];
[self setKeyEquivalentModifierMask: keyMask];
}
if ([aDecoder containsValueForKey: @"NSMnemonicLoc"])
{
int loc = [aDecoder decodeIntForKey: @"NSMnemonicLoc"];
[self setMnemonicLocation: loc];
}
int loc = [aDecoder decodeIntForKey: @"NSMnemonicLoc"];
[self setMnemonicLocation: loc];
}
if ([aDecoder containsValueForKey: @"NSState"])
{
int state = [aDecoder decodeIntForKey: @"NSState"];
[self setState: state];
}
int state = [aDecoder decodeIntForKey: @"NSState"];
[self setState: state];
}
}
else
{
@ -574,6 +574,10 @@ static Class imageClass;
[aDecoder decodeValueOfObjCType: @encode(id) at: &_title];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent];
[aDecoder decodeValueOfObjCType: "I" at: &_keyEquivalentModifierMask];
if (version <= 3)
{
_keyEquivalentModifierMask = _keyEquivalentModifierMask << 16;
}
[aDecoder decodeValueOfObjCType: "I" at: &_mnemonicLocation];
[aDecoder decodeValueOfObjCType: "i" at: &_state];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_enabled];
@ -584,22 +588,22 @@ static Class imageClass;
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_changesState];
if (version == 1)
{
_target = [aDecoder decodeObject];
}
_target = [aDecoder decodeObject];
}
[aDecoder decodeValueOfObjCType: @encode(SEL) at: &_action];
[aDecoder decodeValueOfObjCType: "i" at: &_tag];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_representedObject];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_submenu];
if (version >= 2)
{
_target = [aDecoder decodeObject];
}
if (version == 3)
_target = [aDecoder decodeObject];
}
if (version >= 3)
{
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_isAlternate];
[aDecoder decodeValueOfObjCType: @encode(char) at: &_indentation];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_toolTip];
}
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_isAlternate];
[aDecoder decodeValueOfObjCType: @encode(char) at: &_indentation];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_toolTip];
}
}
return self;