* Source/GSNibLoading.m: Changes to initialize bounds in

NSCustomView.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27316 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2008-12-16 22:17:27 +00:00
parent 1ecd731b02
commit 941c0684cb
2 changed files with 15 additions and 13 deletions

View file

@ -1,3 +1,8 @@
2008-12-16 17:23-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/GSNibLoading.m: Changes to initialize bounds in
NSCustomView.
2008-12-16 16:41-EST Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSView.m: Add back in matrix initialization.

View file

@ -927,9 +927,16 @@ static BOOL _isInInterfaceBuilder = NO;
[_view setAutoresizesSubviews: ((vFlags & 0x100) == 0x100)];
[_view setHidden: ((vFlags & 0x80000000) == 0x80000000)];
}
[_view setNextResponder: [self nextResponder]];
/*
if ([coder containsValueForKey: @"NSNextResponder"])
{
[_view setNextResponder: [coder decodeObjectForKey: @"NSNextResponder"]];
}
*/
// reset the bounds...
[_view setBounds: [_view frame]];
subs = [coder decodeObjectForKey: @"NSSubviews"];
en = [subs objectEnumerator];
while((v = [en nextObject]) != nil)
@ -980,10 +987,6 @@ static BOOL _isInInterfaceBuilder = NO;
[self nibInstantiateWithCoder: coder];
}
// Prevent the case where we get back an NSCustomView.
// NSAssert((([NSClassSwapper isInInterfaceBuilder] == NO) &&
// ([_view class] != [NSCustomView class])), NSInvalidArgumentException);
if(self != _view)
{
AUTORELEASE(self);
@ -1615,12 +1618,6 @@ static BOOL _isInInterfaceBuilder = NO;
}
}
// awaken the owner.
// if([owner respondsToSelector: @selector(awakeFromNib)])
// {
// [owner awakeFromNib];
// }
// bring visible windows to front...
en = [_visibleWindows objectEnumerator];
while ((obj = [en nextObject]) != nil)