gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSCell and NSPanel gmodel decoding tweaks

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6397 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Jonathan Gapen 2000-03-31 09:49:36 +00:00
parent db09827113
commit 5459b6903b
2 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2000-03-31 Jonathan Gapen <jagapen@whitewater.chem.wisc.edu>
* Model/GMAppKit.m: Re-organize NSCell's [-initWithModelUnarchiver:]
to unarchive each cell type appropriately. Changed NSPanel
[+createObjectForModelUnarchiver:] so that it correctly creates
an object for NSPanel subclasses.
2000-03-27 Adam Fedor <fedor@gnu.org>
* Changes to use "helper" class for getting backend

37
Model/GMAppKit.m
View file

@ -239,18 +239,38 @@ void __dummy_GMAppKit_functionForLinking() {}
- (id)initWithModelUnarchiver:(GMUnarchiver*)unarchiver
{
int cellType = [unarchiver decodeIntWithName:@"type"];
NSFont* font = [unarchiver decodeObjectWithName:@"font"];
if (!font)
font = [NSFont userFontOfSize:0];
// this is a tricky object to decode, because a number of its methods
// have side-effects; [-setEntryType:] converts the cell to a text-type
// cell and sets its font to the system font, so it comes first
[self setEntryType:[unarchiver decodeIntWithName:@"entryType"]];
// now set the font
[self setFont:font];
// if (model_version >= 2) {
[self setStringValue:[unarchiver decodeStringWithName:@"stringValue"]];
[self setEntryType:[unarchiver decodeIntWithName:@"entryType"]];
// both [-setImage:] and [-setStringValue:] convert the cell to an
// image or text cell (respectively), so they must be called in the
// correct order for the type of cell desired
switch (cellType)
{
case NSTextCellType:
[self setImage:[unarchiver decodeObjectWithName:@"image"]];
[self setStringValue:
[unarchiver decodeStringWithName:@"stringValue"]];
break;
case NSImageCellType:
[self setStringValue:
[unarchiver decodeStringWithName:@"stringValue"]];
[self setImage:[unarchiver decodeObjectWithName:@"image"]];
break;
case NSNullCellType:
[self setType: NSNullCellType];
break;
}
[self setAlignment:[unarchiver decodeIntWithName:@"alignment"]];
[self setWraps:[unarchiver decodeBOOLWithName:@"wraps"]];
[self setImage:[unarchiver decodeObjectWithName:@"image"]];
[self setState:[unarchiver decodeIntWithName:@"state"]];
[self setEnabled:[unarchiver decodeBOOLWithName:@"isEnabled"]];
[self setBordered:[unarchiver decodeBOOLWithName:@"isBordered"]];
@ -261,8 +281,6 @@ void __dummy_GMAppKit_functionForLinking() {}
[self setContinuous:[unarchiver decodeBOOLWithName:@"isContinuous"]];
/* Temporary commented out so buttons keep on working - new code fixing this under testing */
// [self sendActionOn:[unarchiver decodeIntWithName:@"sendActionMask"]];
[self setType:[unarchiver decodeIntWithName:@"type"]];
// }
return self;
}
@ -1222,10 +1240,11 @@ void __dummy_GMAppKit_functionForLinking() {}
@"backingType"];
unsigned styleMask = [unarchiver decodeUnsignedIntWithName:@"styleMask"];
NSRect ctRect = [unarchiver decodeRectWithName:@"contentFrame"];
NSPanel* panel = [[[NSPanel allocWithZone:[unarchiver objectZone]]
NSPanel* panel = [[[[self class] allocWithZone:[unarchiver objectZone]]
initWithContentRect:ctRect
styleMask:styleMask backing:backingType defer:YES]
autorelease];
// use [self class] here, so it works for subclasses
return panel;
}