gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-21 00:50:57 +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:
Fred Kiefer 2007-08-07 15:56:03 +00:00
parent 0572190f62
commit 2e12f2a37e
3 changed files with 39 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/NSButtonCell.m
View file

@ -113,7 +113,7 @@ typedef struct _GSButtonCellFlags
+ (void) initialize
{
if (self == [NSButtonCell class])
[self setVersion: 2];
[self setVersion: 3];
}
/*
@ -1739,6 +1739,7 @@ typedef struct _GSButtonCellFlags
else
{
BOOL tmp;
int version = [aDecoder versionForClassName: @"NSButtonCell"];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalent];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_keyEquivalentFont];
@ -1748,13 +1749,17 @@ typedef struct _GSButtonCellFlags
_buttoncell_is_transparent = tmp;
[aDecoder decodeValueOfObjCType: @encode(unsigned int)
at: &_keyEquivalentModifierMask];
if (version <= 2)
{
_keyEquivalentModifierMask = _keyEquivalentModifierMask << 16;
}
[aDecoder decodeValueOfObjCType: @encode(unsigned int)
at: &_highlightsByMask];
[aDecoder decodeValueOfObjCType: @encode(unsigned int)
at: &_showAltStateMask];
if ([aDecoder versionForClassName: @"NSButtonCell"] >= 2)
{
if (version >= 2)
{
[aDecoder decodeValueOfObjCType: @encode(id) at: &_sound];
[aDecoder decodeValueOfObjCType: @encode(id) at: &_backgroundColor];
[aDecoder decodeValueOfObjCType: @encode(float) at: &_delayInterval];
@ -1767,7 +1772,7 @@ typedef struct _GSButtonCellFlags
_image_dims_when_disabled = tmp;
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &tmp];
_shows_border_only_while_mouse_inside = tmp;
}
}
}
return self;
}