Merged in 'dawn' CVS branch

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3827 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-03-02 08:58:30 +00:00
parent ac6ec019f7
commit 55b55d3fee
65 changed files with 794 additions and 774 deletions

View file

@ -93,9 +93,9 @@
[super dealloc];
}
- (id)copyWithZone:(NSZone*)zone
- (id) copyWithZone: (NSZone*)zone
{
NSTextFieldCell* c = [super copyWithZone:zone];
NSTextFieldCell *c = [super copyWithZone: zone];
[c setBackgroundColor: background_color];
[c setTextColor: text_color];
@ -229,35 +229,24 @@
[super setStringValue:aString];
}
//
// Displaying
//
- (void)drawWithFrame:(NSRect)cellFrame
inView:(NSView *)controlView
{
// Save last view drawn to
control_view = controlView;
[super drawWithFrame:cellFrame inView:controlView];
}
//
// NSCoding protocol
//
- (void)encodeWithCoder:aCoder
- (void) encodeWithCoder: (NSCoder*)aCoder
{
[super encodeWithCoder:aCoder];
[super encodeWithCoder: aCoder];
[aCoder encodeObject: background_color];
[aCoder encodeObject: text_color];
[aCoder encodeValueOfObjCType: @encode(id) at: &background_color];
[aCoder encodeValueOfObjCType: @encode(id) at: &text_color];
[aCoder encodeValueOfObjCType: @encode(BOOL) at: &draw_background];
}
- initWithCoder:aDecoder
- (id) initWithCoder: (NSCoder*)aDecoder
{
[super initWithCoder:aDecoder];
[super initWithCoder: aDecoder];
background_color = [aDecoder decodeObject];
text_color = [aDecoder decodeObject];
[aDecoder decodeValueOfObjCType: @encode(id) at: &background_color];
[aDecoder decodeValueOfObjCType: @encode(id) at: &text_color];
[aDecoder decodeValueOfObjCType: @encode(BOOL) at: &draw_background];
return self;