mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-23 12:00:52 +00:00
* Source/GSNibLoading.m: (-[NSCustomView initWithCoder:]) replace
with real object and also replace in the coder. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@27271 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
a35e14751d
commit
2e585bc667
2 changed files with 20 additions and 8 deletions
|
@ -1,3 +1,8 @@
|
|||
2008-12-10 01:37-EST Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Source/GSNibLoading.m: (-[NSCustomView initWithCoder:]) replace
|
||||
with real object and also replace in the coder.
|
||||
|
||||
2008-12-09 23:26-EST Gregory John Casamento <greg_casamento@yahoo.com>
|
||||
|
||||
* Source/GSGormLoading.m: (-[GSNibItem initWithCoder:]) initialize
|
||||
|
|
|
@ -824,7 +824,8 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
|
||||
if ([NSClassSwapper isInInterfaceBuilder])
|
||||
{
|
||||
aClass = [self class];
|
||||
_view = self;
|
||||
return self;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -843,8 +844,10 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
[_view setAutoresizesSubviews: [self autoresizesSubviews]];
|
||||
[_view setHidden: [self isHidden]];
|
||||
[_view setNextResponder: [self nextResponder]];
|
||||
// [[self superview] replaceSubview: self with: _view]; // replace the old view...
|
||||
if (_rFlags.has_subviews)
|
||||
// [[self superview] replaceSubview: self with: _view]; // replace the old view...
|
||||
|
||||
/*
|
||||
if (_rFlags.has_subviews)
|
||||
{
|
||||
NSArray *subviews = [self subviews];
|
||||
int i;
|
||||
|
@ -854,7 +857,7 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
[_view addSubview: [subviews objectAtIndex: i]];
|
||||
}
|
||||
}
|
||||
// FIXME: Need to transfer all other settings as well
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -871,9 +874,12 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
ASSIGN(_className, [coder decodeObjectForKey: @"NSClassName"]);
|
||||
ASSIGN(_extension, [coder decodeObjectForKey: @"NSExtension"]);
|
||||
|
||||
AUTORELEASE(self);
|
||||
self = [self nibInstantiate];
|
||||
RETAIN(self);
|
||||
[self nibInstantiate];
|
||||
if(self != _view)
|
||||
{
|
||||
AUTORELEASE(self);
|
||||
[coder replaceObject: self withObject: _view];
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -882,7 +888,8 @@ static BOOL _isInInterfaceBuilder = NO;
|
|||
NSStringFromClass([coder class])];
|
||||
}
|
||||
}
|
||||
return self;
|
||||
|
||||
return _view;
|
||||
}
|
||||
|
||||
- (void) encodeWithCoder: (NSCoder *)coder
|
||||
|
|
Loading…
Reference in a new issue