Merge branch 'master' of github.com:280north/cappuccino

This commit is contained in:
Alexander Ljungberg
2011-05-17 00:12:08 -04:00
+4 -2
View File
@@ -34,8 +34,10 @@
if (self)
{
[self setBordered:[aCoder decodeBoolForKey:"NSIsBordered"]];
[self setColor:[aCoder decodeObjectForKey:"NSColor"]];
// NSColorWell keeps its own enabled state, there is no cell enabled state
[self setEnabled:[aCoder decodeBoolForKey:@"NSEnabled"]];
[self setBordered:[aCoder decodeBoolForKey:@"NSIsBordered"]];
[self setColor:[aCoder decodeObjectForKey:@"NSColor"]];
}
return self;