From 89476fb54e37e286e5da5aa78e2d5f51721cfe14 Mon Sep 17 00:00:00 2001 From: Francisco Ryan Tolmasky I Date: Tue, 6 Jan 2009 09:20:14 +0800 Subject: [PATCH] Fix for tags not being encoded/decoded in CPMenuItems. [#132 state:resolved]. Signed-off-by: Tom Robinson --- AppKit/CPMenuItem.j | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/AppKit/CPMenuItem.j b/AppKit/CPMenuItem.j index 995d121bc..a934f7a23 100644 --- a/AppKit/CPMenuItem.j +++ b/AppKit/CPMenuItem.j @@ -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];