mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-29 19:47:39 +00:00
Misc fixes for Tims FileViewer app
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@4148 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
1a73bbbaf7
commit
d13cc54126
7 changed files with 26 additions and 7 deletions
|
@ -114,6 +114,8 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
{
|
||||
[super encodeWithModelArchiver:archiver];
|
||||
|
||||
[archiver encodeSize:[self contentViewMargins]
|
||||
withName:@"contentViewMargins"];
|
||||
[archiver encodeInt:[self borderType] withName:@"borderType"];
|
||||
[archiver encodeInt:[self titlePosition] withName:@"titlePosition"];
|
||||
[archiver encodeString:[self title] withName:@"title"];
|
||||
|
@ -125,6 +127,7 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
{
|
||||
self = [super initWithModelUnarchiver:unarchiver];
|
||||
|
||||
[self setContentViewMargins:[unarchiver decodeSizeWithName:@"contentViewMargins"]];
|
||||
[self setBorderType:[unarchiver decodeIntWithName:@"borderType"]];
|
||||
[self setTitlePosition:[unarchiver decodeIntWithName:@"titlePosition"]];
|
||||
[self setTitle:[unarchiver decodeStringWithName:@"title"]];
|
||||
|
@ -965,7 +968,7 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
|
||||
- (void)encodeWithModelArchiver:(GMArchiver*)archiver
|
||||
{
|
||||
[archiver encodeRect:[self frame] withName:@"frame"];
|
||||
[archiver encodeRect:[[self contentView]frame] withName:@"contentFrame"];
|
||||
[archiver encodeSize:[self maxSize] withName:@"maxSize"];
|
||||
[archiver encodeSize:[self minSize] withName:@"minSize"];
|
||||
[archiver encodeString:[self frameAutosaveName]
|
||||
|
@ -990,12 +993,14 @@ void __dummy_GMAppKit_functionForLinking() {}
|
|||
{
|
||||
unsigned backingType = [unarchiver decodeUnsignedIntWithName:@"backingType"];
|
||||
unsigned styleMask = [unarchiver decodeUnsignedIntWithName:@"styleMask"];
|
||||
NSRect aRect = [unarchiver decodeRectWithName:@"frame"];
|
||||
NSRect ctRect = [unarchiver decodeRectWithName:@"contentFrame"];
|
||||
NSWindow* win = [[[NSWindow allocWithZone:[unarchiver objectZone]]
|
||||
initWithContentRect:aRect
|
||||
initWithContentRect:ctRect
|
||||
styleMask:styleMask backing:backingType defer:YES]
|
||||
autorelease];
|
||||
|
||||
// printf("content: %g, %g -- frame %g, %g\n", ctRect.size.width, ctRect.size.height, [win frame].size.width, [win frame].size.height);
|
||||
|
||||
return win;
|
||||
}
|
||||
|
||||
|
|
|
@ -106,16 +106,19 @@ extern BOOL _fileOwnerDecoded;
|
|||
customView->extension = [unarchiver decodeObjectWithName:@"extension"];
|
||||
customView->realObject = [unarchiver decodeObjectWithName:@"realObject"];
|
||||
customView->realObject = _nibOwner;
|
||||
[customView setFrame:[unarchiver decodeRectWithName:@"frame"]];
|
||||
|
||||
return customView;
|
||||
}
|
||||
|
||||
customView->className = [unarchiver decodeStringWithName:@"className"];
|
||||
customView->extension = [unarchiver decodeObjectWithName:@"extension"];
|
||||
customView->realObject = [unarchiver decodeObjectWithName:@"realObject"];
|
||||
[customView setFrame:[unarchiver decodeRectWithName:@"frame"]];
|
||||
|
||||
class = NSClassFromString (customView->className);
|
||||
if (class)
|
||||
customView->realObject = [[class alloc] init];
|
||||
customView->realObject = [[class alloc] initWithFrame:[customView frame]];
|
||||
else {
|
||||
NSLog (@"Class %@ not linked into application!", customView->className);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue