Skip to content

Commit

Permalink
Fix for tags not being encoded/decoded in CPMenuItems.
Browse files Browse the repository at this point in the history
[cappuccino#132 state:resolved].
  • Loading branch information
Francisco Ryan Tolmasky I committed Jan 6, 2009
1 parent 6a5bf82 commit 2c51252
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion AppKit/CPMenuItem.j
Expand Up @@ -92,6 +92,7 @@

_isEnabled = YES;

_tag = 0;
_state = CPOffState;

_keyEquivalent = aKeyEquivalent || @"";
Expand Down Expand Up @@ -749,6 +750,8 @@ var CPMenuItemTitleKey = @"CPMenuItemTitleKey",
CPMenuItemIsEnabledKey = @"CPMenuItemIsEnabledKey",
CPMenuItemIsHiddenKey = @"CPMenuItemIsHiddenKey",

CPMenuItemTagKey = @"CPMenuItemTagKey",

CPMenuItemImageKey = @"CPMenuItemImageKey",
CPMenuItemAlternateImageKey = @"CPMenuItemAlternateImageKey",

Expand Down Expand Up @@ -779,7 +782,8 @@ var CPMenuItemTitleKey = @"CPMenuItemTitleKey",
_isEnabled = [aCoder decodeObjectForKey:CPMenuItemIsEnabledKey];
_isHidden = [aCoder decodeObjectForKey:CPMenuItemIsHiddenKey];

// int _tag;
_tag = [aCoder containsObjectForKey:CPMenuItemTagKey] ? [aCoder objectForKey:CPMenuItemTagKey] : 0;

// int _state;

_image = [aCoder decodeObjectForKey:CPMenuItemImageKey];
Expand Down Expand Up @@ -823,6 +827,9 @@ var CPMenuItemTitleKey = @"CPMenuItemTitleKey",
[aCoder encodeObject:_isEnabled forKey:CPMenuItemIsEnabledKey];
[aCoder encodeObject:_isHidden forKey:CPMenuItemIsHiddenKey];

if (_tag !== 0)
[aCoder encodeObject:_tag forKey:CPMenuItemTagKey];

[aCoder encodeObject:_image forKey:CPMenuItemImageKey];
[aCoder encodeObject:_alternateImage forKey:CPMenuItemAlternateImageKey];

Expand Down

0 comments on commit 2c51252

Please sign in to comment.