mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-04-26 14:10:54 +00:00
Tidy nib stuff
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5652 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard
parent
5b6b7b366b
commit
ecad93d9c8
3 changed files with 114 additions and 98 deletions
|
|
@ -1,3 +1,8 @@
|
|||
Mon Jan 3 18:35:00 2000 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* Source/NSBundleAdditions.m: Added ([-awakeWithContext:]) method for
|
||||
nib containers to wake up a newly unarchived nib.
|
||||
|
||||
2000-01-03 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* Source/NSBitmapImageRep.m ([NSBitmapImageRep -draw]): Use
|
||||
|
|
|
|||
|
|
@ -69,7 +69,9 @@
|
|||
{
|
||||
NSMutableDictionary *nameTable;
|
||||
NSMutableArray *connections;
|
||||
BOOL _isAwake;
|
||||
}
|
||||
- (void) awakeWithContext: (NSDictionary*)context;
|
||||
- (NSMutableDictionary*) nameTable;
|
||||
- (NSMutableArray*) connections;
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -139,25 +139,29 @@
|
|||
@implementation NSNibOutletConnector
|
||||
- (void) establishConnection
|
||||
{
|
||||
NSString *selName;
|
||||
SEL sel;
|
||||
if (_src != nil)
|
||||
{
|
||||
NSString *selName;
|
||||
SEL sel;
|
||||
|
||||
selName = [NSString stringWithFormat: @"set%@:", [_tag capitalizedString]];
|
||||
sel = NSSelectorFromString(selName);
|
||||
selName = [NSString stringWithFormat: @"set%@:",
|
||||
[_tag capitalizedString]];
|
||||
sel = NSSelectorFromString(selName);
|
||||
|
||||
if ([_src respondsToSelector: sel])
|
||||
{
|
||||
[_src performSelector: sel withObject: _dst];
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Use the GNUstep additional function to set the instance variable
|
||||
* directly.
|
||||
* FIXME - need some way to do this for libFoundation and Foundation
|
||||
* based systems.
|
||||
*/
|
||||
GSSetInstanceVariable(_src, _tag, (void*)&_dst);
|
||||
if ([_src respondsToSelector: sel])
|
||||
{
|
||||
[_src performSelector: sel withObject: _dst];
|
||||
}
|
||||
else
|
||||
{
|
||||
/*
|
||||
* Use the GNUstep additional function to set the instance variable
|
||||
* directly.
|
||||
* FIXME - need some way to do this for libFoundation and Foundation
|
||||
* based systems.
|
||||
*/
|
||||
GSSetInstanceVariable(_src, _tag, (void*)&_dst);
|
||||
}
|
||||
}
|
||||
}
|
||||
@end
|
||||
|
|
@ -214,88 +218,13 @@
|
|||
{
|
||||
if ([obj isKindOfClass: [GSNibContainer class]])
|
||||
{
|
||||
GSNibContainer *container = obj;
|
||||
NSMutableDictionary *nameTable = [container nameTable];
|
||||
NSMutableArray *connections = [container connections];
|
||||
NSEnumerator *enumerator;
|
||||
NSNibConnector *connection;
|
||||
NSString *key;
|
||||
NSArray *visible;
|
||||
|
||||
[obj awakeWithContext: context];
|
||||
/*
|
||||
* Go through the table of objects in the nib and
|
||||
* retain each one (except ones that are overridden
|
||||
* by values from the 'context table' and retain them
|
||||
* so they will persist after the container is gone.
|
||||
* Add local entries into name table.
|
||||
*/
|
||||
enumerator = [nameTable keyEnumerator];
|
||||
while ((key = [enumerator nextObject]) != nil)
|
||||
{
|
||||
if ([context objectForKey: key] == nil)
|
||||
{
|
||||
RETAIN([nameTable objectForKey: key]);
|
||||
}
|
||||
}
|
||||
[nameTable addEntriesFromDictionary: context];
|
||||
|
||||
/*
|
||||
* Now establish all connections by taking the names
|
||||
* stored in the connection objects, and replaciong them
|
||||
* with the corresponding values from the name table
|
||||
* before telling the connections to establish themselves.
|
||||
*/
|
||||
enumerator = [connections objectEnumerator];
|
||||
while ((connection = [enumerator nextObject]) != nil)
|
||||
{
|
||||
id val;
|
||||
|
||||
val = [nameTable objectForKey: [connection source]];
|
||||
[connection setSource: val];
|
||||
val = [nameTable objectForKey: [connection destination]];
|
||||
[connection setDestination: val];
|
||||
[connection establishConnection];
|
||||
}
|
||||
|
||||
/*
|
||||
* Now tell all the objects that they have been loaded from
|
||||
* a nib.
|
||||
*/
|
||||
enumerator = [nameTable keyEnumerator];
|
||||
while ((key = [enumerator nextObject]) != nil)
|
||||
{
|
||||
if ([context objectForKey: key] == nil)
|
||||
{
|
||||
id o;
|
||||
|
||||
o = [nameTable objectForKey: key];
|
||||
if ([o respondsToSelector: @selector(awakeFromNib)])
|
||||
{
|
||||
[o awakeFromNib];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* See if there are objects that should be made visible.
|
||||
*/
|
||||
visible = [nameTable objectForKey: @"NSVisible"];
|
||||
if (visible != nil
|
||||
&& [visible isKindOfClass: [NSArray class]] == YES)
|
||||
{
|
||||
unsigned pos = [visible count];
|
||||
|
||||
while (pos-- > 0)
|
||||
{
|
||||
[[visible objectAtIndex: pos] orderFront: self];
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Ok - it's all done now - the nib container will
|
||||
* be released when the unarchiver is released, so
|
||||
* we will just be left with the real nib contents.
|
||||
* Ok - it's all done now - just retain the nib container
|
||||
* so tthat it will not be released when the unarchiver
|
||||
* is released, and the nib contents will persist.
|
||||
*/
|
||||
RETAIN(obj);
|
||||
loaded = YES;
|
||||
}
|
||||
else
|
||||
|
|
@ -405,10 +334,90 @@
|
|||
|
||||
|
||||
/*
|
||||
* The GSNibContainer class manages the internals os a nib file.
|
||||
* The GSNibContainer class manages the internals of a nib file.
|
||||
*/
|
||||
@implementation GSNibContainer
|
||||
|
||||
- (void) awakeWithContext: (NSDictionary*)context
|
||||
{
|
||||
if (_isAwake == NO)
|
||||
{
|
||||
NSEnumerator *enumerator;
|
||||
NSNibConnector *connection;
|
||||
NSString *key;
|
||||
NSArray *visible;
|
||||
|
||||
_isAwake = YES;
|
||||
/*
|
||||
* Add local entries into name table.
|
||||
*/
|
||||
if ([context count] > 0)
|
||||
{
|
||||
[nameTable addEntriesFromDictionary: context];
|
||||
}
|
||||
|
||||
/*
|
||||
* Now establish all connections by taking the names
|
||||
* stored in the connection objects, and replaciong them
|
||||
* with the corresponding values from the name table
|
||||
* before telling the connections to establish themselves.
|
||||
*/
|
||||
enumerator = [connections objectEnumerator];
|
||||
while ((connection = [enumerator nextObject]) != nil)
|
||||
{
|
||||
id val;
|
||||
|
||||
val = [nameTable objectForKey: [connection source]];
|
||||
[connection setSource: val];
|
||||
val = [nameTable objectForKey: [connection destination]];
|
||||
[connection setDestination: val];
|
||||
[connection establishConnection];
|
||||
}
|
||||
|
||||
/*
|
||||
* Now tell all the objects that they have been loaded from
|
||||
* a nib.
|
||||
*/
|
||||
enumerator = [nameTable keyEnumerator];
|
||||
while ((key = [enumerator nextObject]) != nil)
|
||||
{
|
||||
if ([context objectForKey: key] == nil)
|
||||
{
|
||||
id o;
|
||||
|
||||
o = [nameTable objectForKey: key];
|
||||
if ([o respondsToSelector: @selector(awakeFromNib)])
|
||||
{
|
||||
[o awakeFromNib];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* See if there are objects that should be made visible.
|
||||
*/
|
||||
visible = [nameTable objectForKey: @"NSVisible"];
|
||||
if (visible != nil
|
||||
&& [visible isKindOfClass: [NSArray class]] == YES)
|
||||
{
|
||||
unsigned pos = [visible count];
|
||||
|
||||
while (pos-- > 0)
|
||||
{
|
||||
[[visible objectAtIndex: pos] orderFront: self];
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Now remove any objects added from the context dictionary.
|
||||
*/
|
||||
if ([context count] > 0)
|
||||
{
|
||||
[nameTable removeObjectsForKeys: [context allKeys]];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (NSMutableArray*) connections
|
||||
{
|
||||
return connections;
|
||||
|
|
|
|||
Loading…
Reference in a new issue