Merge branch 'master' into tableview

This commit is contained in:
Francisco Ryan Tolmasky I committed 2009-06-16 17:22:13 -07:00
commit c6795fdfcf
3 files changed
+26

No files matched your search

+5
View File
@@ -14,6 +14,11 @@ var _CPCibCustomObjectClassName = @"_CPCibCustomObjectClassName";
return _className;
}
- (void)setCustomClassName:(CPString)aClassName
{
_className = aClassName;
}
- (CPString)description
{
return [super description] + " (" + [self customClassName] + ')';
+10
View File
@@ -35,6 +35,11 @@
return _className;
}
- (void)setCustomClassName:(CPString)aClassName
{
_className = aClassName;
}
@end
var _CPCibCustomViewClassNameKey = @"_CPCibCustomViewClassNameKey";
@@ -58,6 +63,11 @@ var _CPCibCustomViewClassNameKey = @"_CPCibCustomViewClassNameKey";
[aCoder encodeObject:_className forKey:_CPCibCustomViewClassNameKey];
}
- (CPString)customClassName
{
return _className;
}
- (id)_cibInstantiate
{
var theClass = CPClassFromString(_className);
+11
View File
@@ -97,6 +97,17 @@ var _CPCibWindowTemplateMinSizeKey = @"_CPCibWindowTemplateMinSizeK
[aCoder encodeObject:_windowIsFullBridge forKey:_CPCibWindowTemplateWindowIsFullBridgeKey];
}
- (CPString)customClassName
{
return _windowClass;
}
- (void)setCustomClassName:(CPString)aClassName
{
_windowClass = aClassName;
}
- (CPString)windowClass
{
return _windowClass;