Adding custom class changes.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14747 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2002-10-13 06:03:10 +00:00
parent 504b32f99c
commit 7ae86bf2f5
3 changed files with 54 additions and 10 deletions

View file

@ -1,3 +1,10 @@
2002-10-13 Gregory John Casamento <greg_casamento@yahoo.com>
* Headers/GSNibTemplates.h: Added parentClassName member to
templates so that the parent of the custom class could be stored.
* Source/NSBundleAdditions.m: Made necessary modfications to the
template implementations to use the parent class name
2002-10-13 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSSavePanel.m: ([--browser:createRowsForColumn:inMatrix:])

View file

@ -80,6 +80,7 @@
@interface NSWindowTemplate : NSWindow <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
BOOL _deferFlag;
}
@end
@ -87,30 +88,35 @@
@interface NSViewTemplate : NSView <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSTextTemplate : NSText <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSTextViewTemplate : NSTextView <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSMenuTemplate : NSMenu <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
}
@end
@interface NSControlTemplate : NSControl <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
id _delegate;
id _dataSource;
BOOL _usesDataSource;
@ -120,6 +126,7 @@
@interface NSButtonTemplate : NSButton <GSTemplate>
{
NSString *_className;
NSString *_parentClassName;
NSButtonType _buttonType;
}
@end

View file

@ -730,6 +730,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
// defer flag...
_deferFlag = NO;
@ -740,6 +742,7 @@ Class gmodel_class(void)
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
return [super initWithCoder: aCoder];
}
@ -747,6 +750,7 @@ Class gmodel_class(void)
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_deferFlag];
[super encodeWithCoder: aCoder];
}
@ -832,6 +836,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
[super initWithFrame: frame];
return self;
@ -843,20 +849,22 @@ Class gmodel_class(void)
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[super initWithCoder: aCoder];
return self;
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
@ -921,6 +929,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
[super initWithFrame: frame];
return self;
}
@ -937,14 +947,14 @@ Class gmodel_class(void)
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[super initWithCoder: aCoder];
return self;
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
@ -1018,6 +1028,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
[super initWithFrame: frame];
return self;
}
@ -1027,19 +1039,22 @@ Class gmodel_class(void)
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[super initWithCoder: aCoder];
return self;
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
@ -1118,19 +1133,22 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[super initWithCoder: aCoder];
return self;
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
return [super initWithCoder: aCoder];
}
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[super encodeWithCoder: aCoder];
}
@ -1194,6 +1212,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
[super initWithFrame: frame];
return self;
@ -1205,12 +1225,15 @@ Class gmodel_class(void)
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
return self;
}
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(id) at: &_delegate];
[aCoder decodeValueOfObjCType: @encode(id) at: &_dataSource];
[aCoder decodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
@ -1220,6 +1243,7 @@ Class gmodel_class(void)
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(id) at: &_delegate];
[aCoder encodeValueOfObjCType: @encode(id) at: &_dataSource];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &_usesDataSource];
@ -1310,6 +1334,8 @@ Class gmodel_class(void)
// Start initially with the highest level class...
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
_buttonType = NSMomentaryLightButton;
[super initWithFrame: frame];
@ -1322,6 +1348,8 @@ Class gmodel_class(void)
[super init];
ASSIGN(_className, NSStringFromClass([super class]));
RETAIN(_className);
ASSIGN(_parentClassName, NSStringFromClass([super class]));
RETAIN(_parentClassName);
_buttonType = NSMomentaryLightButton;
return self;
}
@ -1329,6 +1357,7 @@ Class gmodel_class(void)
- (id) initWithCoder: (NSCoder *)aCoder
{
[aCoder decodeValueOfObjCType: @encode(id) at: &_className];
[aCoder decodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder decodeValueOfObjCType: @encode(int) at: &_buttonType];
return [super initWithCoder: aCoder];
}
@ -1336,6 +1365,7 @@ Class gmodel_class(void)
- (void) encodeWithCoder: (NSCoder *)aCoder
{
[aCoder encodeValueOfObjCType: @encode(id) at: &_className];
[aCoder encodeValueOfObjCType: @encode(id) at: &_parentClassName];
[aCoder encodeValueOfObjCType: @encode(int) at: &_buttonType];
[super encodeWithCoder: aCoder];
}