mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-20 17:06:23 +00:00
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:
parent
e1c99d6512
commit
dbbeff810a
65 changed files with 794 additions and 774 deletions
|
@ -86,14 +86,14 @@ static id _NSCONTROL_CELL_CLASS = nil;
|
|||
//
|
||||
// Creating copies
|
||||
//
|
||||
- copyWithZone:(NSZone *)zone
|
||||
- (id) copyWithZone: (NSZone*)zone
|
||||
{
|
||||
id c = NSCopyObject (self, 0, zone);
|
||||
id c = NSCopyObject(self, 0, zone);
|
||||
NSCell *o = [cell copy];
|
||||
|
||||
[cell retain]; // give new control
|
||||
[c setCell: [[cell copy] autorelease]]; // a copy of cell
|
||||
|
||||
return c;
|
||||
[c setCell: o];
|
||||
[o release];
|
||||
return c;
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -439,22 +439,22 @@ unsigned int event_mask = NSLeftMouseDownMask | NSLeftMouseUpMask |
|
|||
//
|
||||
// NSCoding protocol
|
||||
//
|
||||
- (void)encodeWithCoder:aCoder
|
||||
- (void) encodeWithCoder: (NSCoder*)aCoder
|
||||
{
|
||||
[super encodeWithCoder:aCoder];
|
||||
[super encodeWithCoder: aCoder];
|
||||
|
||||
[aCoder encodeValueOfObjCType: "i" at: &tag];
|
||||
[aCoder encodeObject: cell];
|
||||
[aCoder encodeValueOfObjCType: @encode(int) at: &tag];
|
||||
[aCoder encodeObject: cell];
|
||||
}
|
||||
|
||||
- initWithCoder:aDecoder
|
||||
- (id) initWithCoder: (NSCoder*)aDecoder
|
||||
{
|
||||
[super initWithCoder:aDecoder];
|
||||
[super initWithCoder: aDecoder];
|
||||
|
||||
[aDecoder decodeValueOfObjCType: "i" at: &tag];
|
||||
cell = [aDecoder decodeObject];
|
||||
|
||||
return self;
|
||||
[aDecoder decodeValueOfObjCType: @encode(int) at: &tag];
|
||||
[aDecoder decodeValueOfObjCType: @encode(id) at: &cell];
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue