gnustep/apps-gorm
0
0
Fork 0
mirror of https://github.com/gnustep/apps-gorm.git synced 2025-02-23 19:51:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly interpret NSApplication and other top level objects, except NSWindowTemplate.

Browse source
This commit is contained in:
Gregory John Casamento 2021-04-23 06:35:50 -04:00
parent 99d9d529ed
commit 94955a248a
3 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
GormCore/GormPrivate.m
View file

@ -220,6 +220,11 @@ static BOOL _isInInterfaceBuilder = NO;
return image;
}
- (NSString *) description
{
NSString *desc = [super description];
return [NSString stringWithFormat: @"<%@, className = %@>", desc, theClass];
}
@end
// define the class proxy...

10
Plugins/Nib/GormNibWrapperLoader.m
View file

@ -210,13 +210,15 @@
{
NSString *className = [o className];
BOOL isDeferred = [o isDeferred];
BOOL isVisible = [[container visibleWindows] containsObject: o];
BOOL isVisible = [[container visibleWindows]
containsObject: o];
// make the object deferred/visible...
obj = [o nibInstantiate];
[document setObject: obj isDeferred: isDeferred];
[document setObject: obj isVisibleAtLaunch: isVisible];
// record the custom class...
if([classManager isCustomClass: className])
{
@ -226,13 +228,15 @@
if([self isTopLevelObject: obj])
{
[document attachObject: obj toParent: nil];
[document attachObject: obj
toParent: nil];
}
if(customClassName != nil)
{
objName = [document nameForObject: obj];
[classManager setCustomClass: customClassName forName: objName];
[classManager setCustomClass: customClassName
forName: objName];
}
}

54
Plugins/Xib/GormXibWrapperLoader.m
View file

@ -118,11 +118,10 @@
}
else
{
IBObjectRecord *or = nil;
IBConnectionRecord *cr = nil;
NSArray *rootObjects;
id firstResponder;
Class ns_custom_obj_class = NSClassFromString(@"NSCustomObject");
NSArray *rootObjects = nil;
id firstResponder = nil;
// IBObjectRecord *or = nil;
rootObjects = [u decodeObjectForKey: @"IBDocument.RootObjects"];
nibFilesOwner = [rootObjects objectAtIndex: 0];
@ -132,8 +131,7 @@
//
// set the current class on the File's owner...
//
if ([nibFilesOwner isKindOfClass: ns_custom_obj_class] ||
[nibFilesOwner isKindOfClass: [GormObjectProxy class]])
if ([nibFilesOwner isKindOfClass: [GormObjectProxy class]])
{
[docFilesOwner setClassName: [nibFilesOwner className]];
}
@ -141,11 +139,11 @@
//
// add objects...
//
en = [container objectRecordEnumerator];
while ((or = [en nextObject]) != nil)
en = [rootObjects objectEnumerator];
// [container objectRecordEnumerator];
id obj = nil;
while ((obj = [en nextObject]) != nil)
{
id obj = [or object];
id o = obj;
NSString *customClassName = nil;
NSString *objName = nil;
@ -154,17 +152,32 @@
{
continue;
}
//
// If it's NSApplication (most likely the File's Owner
// skip it...
//
if ([obj isKindOfClass: [GormObjectProxy class]])
{
if ([[obj className] isEqualToString: @"NSApplication"])
{
continue;
}
customClassName = [obj className];
}
//
// if it's a window template, then replace it with an
// actual window.
//
if ([obj isKindOfClass: [NSWindowTemplate class]])
id o = nil;
if ([obj isKindOfClass: [GormWindowTemplate class]])
{
NSString *className = [obj className];
BOOL isDeferred = [obj isDeferred];
BOOL isVisible = YES;
// make the object deferred/visible...
o = [obj nibInstantiate];
@ -178,19 +191,22 @@
}
}
if ([rootObjects containsObject: obj])
if ([rootObjects containsObject: obj] && obj != nil)
{
id parent = [or parent];
[document attachObject: o toParent: parent];
[document attachObject: obj
toParent: nil];
}
if (customClassName != nil)
{
objName = [document nameForObject: obj];
[classManager setCustomClass: customClassName forName: objName];
}
}
if (objName != nil)
{
[classManager setCustomClass: customClassName
forName: objName];
}
}
}
/* FIXME: Should use IBDocument.Classes
//