colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-04 09:53:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'integration' of git@github.com:280north/cappuccino into integration

Browse Source
This commit is contained in:
Tom Robinson
2009-01-06 23:33:00 -08:00
parent d942ed415b 541b73e322
commit 88f3186839
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPMenuItem.j
+8 -1
View File
@@ -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 containsValueForKey:CPMenuItemTagKey] ? [aCoder decodeObjectForKey: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];
Foundation/CPString.j
+21
View File
@@ -23,6 +23,7 @@
@import "CPObject.j"
@import "CPException.j"
@import "CPSortDescriptor.j"
@import "CPValue.j"
/*!
@@ -640,4 +641,24 @@ var CPStringHashes = new objj_dictionary();
@end
@implementation CPString (JSON)
/*!
Returns a string representing the supplied JavaScript object encoded as JSON.
*/
+ (CPString)JSONFromObject:(JSObject)anObject
{
return CPJSObjectCreateJSON(anObject);
}
/*!
Returns a JavaScript object decoded from the string's JSON representation.
*/
- (JSObject)objectFromJSON
{
return CPJSObjectCreateWithJSON(self);
}
@end
String.prototype.isa = CPString;