gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reindented

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@13817 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2002-06-10 09:06:40 +00:00
parent f867ecac02
commit e9df1f67e9
1 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

119
Model/GMAppKit.m
View file

@ -230,70 +230,71 @@ void __dummy_GMAppKit_functionForLinking() {}
- (void)encodeWithModelArchiver:(GMArchiver*)archiver - (void)encodeWithModelArchiver:(GMArchiver*)archiver
{ {
[archiver encodeInt:[self type] withName:@"type"]; [archiver encodeInt:[self type] withName:@"type"];
[archiver encodeObject:[self font] withName:@"font"]; [archiver encodeObject:[self font] withName:@"font"];
[archiver encodeString:[self stringValue] withName:@"stringValue"]; [archiver encodeString:[self stringValue] withName:@"stringValue"];
[archiver encodeInt:[self entryType] withName:@"entryType"]; [archiver encodeInt:[self entryType] withName:@"entryType"];
[archiver encodeInt:[self alignment] withName:@"alignment"]; [archiver encodeInt:[self alignment] withName:@"alignment"];
[archiver encodeBOOL:[self wraps] withName:@"wraps"]; [archiver encodeBOOL:[self wraps] withName:@"wraps"];
[archiver encodeObject:[self image] withName:@"image"]; [archiver encodeObject:[self image] withName:@"image"];
[archiver encodeInt:[self state] withName:@"state"]; [archiver encodeInt:[self state] withName:@"state"];
[archiver encodeBOOL:[self isEnabled] withName:@"isEnabled"]; [archiver encodeBOOL:[self isEnabled] withName:@"isEnabled"];
[archiver encodeBOOL:[self isBordered] withName:@"isBordered"]; [archiver encodeBOOL:[self isBordered] withName:@"isBordered"];
[archiver encodeBOOL:[self isBezeled] withName:@"isBezeled"]; [archiver encodeBOOL:[self isBezeled] withName:@"isBezeled"];
[archiver encodeBOOL:[self isEditable] withName:@"isEditable"]; [archiver encodeBOOL:[self isEditable] withName:@"isEditable"];
[archiver encodeBOOL:[self isSelectable] withName:@"isSelectable"]; [archiver encodeBOOL:[self isSelectable] withName:@"isSelectable"];
[archiver encodeBOOL:[self isScrollable] withName:@"isScrollable"]; [archiver encodeBOOL:[self isScrollable] withName:@"isScrollable"];
[archiver encodeBOOL:[self isContinuous] withName:@"isContinuous"]; [archiver encodeBOOL:[self isContinuous] withName:@"isContinuous"];
[archiver encodeInt:[self sendActionOn:0] withName:@"sendActionMask"]; [archiver encodeInt:[self sendActionOn: 0] withName:@"sendActionMask"];
} }
- (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver - (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver
{ {
int cellType = [unarchiver decodeIntWithName:@"type"]; int cellType = [unarchiver decodeIntWithName:@"type"];
NSFont* font = [unarchiver decodeObjectWithName:@"font"]; NSFont* font = [unarchiver decodeObjectWithName:@"font"];
// this is a tricky object to decode, because a number of its methods // this is a tricky object to decode, because a number of its methods
// have side-effects; [-setEntryType:] converts the cell to a text-type // have side-effects; [-setEntryType:] converts the cell to a text-type
// cell and sets its font to the system font, so it comes first // cell and sets its font to the system font, so it comes first
[self setEntryType:[unarchiver decodeIntWithName:@"entryType"]]; [self setEntryType:[unarchiver decodeIntWithName:@"entryType"]];
// now set the font // now set the font
[self setFont:font]; [self setFont:font];
// both [-setImage:] and [-setStringValue:] convert the cell to an // both [-setImage:] and [-setStringValue:] convert the cell to an
// image or text cell (respectively), so they must be called in the // image or text cell (respectively), so they must be called in the
// correct order for the type of cell desired // correct order for the type of cell desired
switch (cellType) switch (cellType)
{ {
case NSTextCellType: case NSTextCellType:
[self setImage:[unarchiver decodeObjectWithName:@"image"]]; [self setImage:[unarchiver decodeObjectWithName:@"image"]];
[self setStringValue: [self setStringValue:
[unarchiver decodeStringWithName:@"stringValue"]];
break;
case NSImageCellType:
[self setStringValue:
[unarchiver decodeStringWithName:@"stringValue"]]; [unarchiver decodeStringWithName:@"stringValue"]];
break; [self setImage:[unarchiver decodeObjectWithName:@"image"]];
case NSImageCellType: break;
[self setStringValue: case NSNullCellType:
[unarchiver decodeStringWithName:@"stringValue"]]; [self setType: NSNullCellType];
[self setImage:[unarchiver decodeObjectWithName:@"image"]]; break;
break; }
case NSNullCellType: [self setAlignment:[unarchiver decodeIntWithName:@"alignment"]];
[self setType: NSNullCellType]; [self setWraps:[unarchiver decodeBOOLWithName:@"wraps"]];
break; [self setState:[unarchiver decodeIntWithName:@"state"]];
} [self setEnabled:[unarchiver decodeBOOLWithName:@"isEnabled"]];
[self setAlignment:[unarchiver decodeIntWithName:@"alignment"]]; [self setBordered:[unarchiver decodeBOOLWithName:@"isBordered"]];
[self setWraps:[unarchiver decodeBOOLWithName:@"wraps"]]; [self setBezeled:[unarchiver decodeBOOLWithName:@"isBezeled"]];
[self setState:[unarchiver decodeIntWithName:@"state"]]; [self setEditable:[unarchiver decodeBOOLWithName:@"isEditable"]];
[self setEnabled:[unarchiver decodeBOOLWithName:@"isEnabled"]]; [self setSelectable:[unarchiver decodeBOOLWithName:@"isSelectable"]];
[self setBordered:[unarchiver decodeBOOLWithName:@"isBordered"]]; [self setScrollable:[unarchiver decodeBOOLWithName:@"isScrollable"]];
[self setBezeled:[unarchiver decodeBOOLWithName:@"isBezeled"]]; [self setContinuous:[unarchiver decodeBOOLWithName:@"isContinuous"]];
[self setEditable:[unarchiver decodeBOOLWithName:@"isEditable"]]; /* Temporary commented out so buttons keep on working - new code
[self setSelectable:[unarchiver decodeBOOLWithName:@"isSelectable"]]; * fixing this under testing */
[self setScrollable:[unarchiver decodeBOOLWithName:@"isScrollable"]]; // [self sendActionOn:[unarchiver decodeIntWithName:@"sendActionMask"]];
[self setContinuous:[unarchiver decodeBOOLWithName:@"isContinuous"]];
/* Temporary commented out so buttons keep on working - new code fixing this under testing */ return self;
// [self sendActionOn:[unarchiver decodeIntWithName:@"sendActionMask"]];
return self;
} }
@end /* NSCell (GMArchiverMethods) */ @end /* NSCell (GMArchiverMethods) */