mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-09-29 05:37:41 +00:00
Fix for tags not being encoded/decoded in CPMenuItems.
[#132 state:resolved]. Signed-off-by: Tom Robinson <yachttom@gmail.com>
This commit is contained in:
committed by
Tom Robinson
parent
1a56d10bef
commit
89476fb54e
+8
-1
@@ -92,6 +92,7 @@
|
||||
|
||||
_isEnabled = YES;
|
||||
|
||||
_tag = 0;
|
||||
_state = CPOffState;
|
||||
|
||||
_keyEquivalent = aKeyEquivalent || @"";
|
||||
@@ -749,6 +750,8 @@ var CPMenuItemTitleKey = @"CPMenuItemTitleKey",
|
||||
CPMenuItemIsEnabledKey = @"CPMenuItemIsEnabledKey",
|
||||
CPMenuItemIsHiddenKey = @"CPMenuItemIsHiddenKey",
|
||||
|
||||
CPMenuItemTagKey = @"CPMenuItemTagKey",
|
||||
|
||||
CPMenuItemImageKey = @"CPMenuItemImageKey",
|
||||
CPMenuItemAlternateImageKey = @"CPMenuItemAlternateImageKey",
|
||||
|
||||
@@ -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];
|
||||
@@ -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];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user