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

Fix failure to import custom class correctly from XIB

Browse source
This commit is contained in:
Gregory John Casamento 2023-07-07 23:12:10 -04:00
parent 78bbf83852
commit b0b4c075fb
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
GormCore/GormAbstractDelegate.m
View file

@ -125,13 +125,16 @@
/*
* Start the server
*/
[conn setRootObject: self];
if([conn registerName: @"GormServer"] == NO)
if ([self isInTool] == NO)
{
NSLog(@"Could not register GormServer");
[conn setRootObject: self];
if([conn registerName: @"GormServer"] == NO)
{
NSLog(@"Could not register GormServer");
}
}
}
return self;
}

32
GormCore/Plugins/Xib/GormXibWrapperLoader.m
View file

@ -55,18 +55,29 @@
}
- (id) _replaceProxyInstanceWithRealObject: (id)obj
classManager: (GormClassManager *)classManager
{
NSString *className = [obj className];
if ([obj isKindOfClass: [GormObjectProxy class]])
{
if ([[obj className] isEqualToString: @"NSApplication"])
if ([className isEqualToString: @"NSApplication"])
{
return [document filesOwner];
}
if ([[obj className] isEqualToString: @"FirstResponder"])
else if ([className isEqualToString: @"FirstResponder"])
{
return [document firstResponder];
}
else
{
[classManager addClassNamed: className
withSuperClassNamed: @"NSObject"
withActions: nil
withOutlets: nil
isCustom: YES];
}
}
else if (obj == nil)
{
@ -254,7 +265,7 @@
NSString *customClassName = nil;
NSDictionary *decoded = [u decoded];
NSDebugLog(@"customClasses = %@", customClasses);
NSLog(@"customClasses = %@", customClasses);
while ((customClassName = [en nextObject]) != nil)
{
NSDictionary *customClassDict = [customClasses objectForKey: customClassName];;
@ -263,7 +274,8 @@
id realObject = [decoded objectForKey: theId];
NSString *theName = nil;
realObject = [self _replaceProxyInstanceWithRealObject: realObject];
realObject = [self _replaceProxyInstanceWithRealObject: realObject
classManager: classManager];
NSDebugLog(@"realObject = %@", realObject);
if ([doc containsObject: realObject])
@ -282,8 +294,9 @@
parentClassName = @"NSObject";
}
NSDebugLog(@"Adding customClassName = %@ with parent className = %@", customClassName,
NSLog(@"Adding customClassName = %@ with parent className = %@", customClassName,
parentClassName);
[classManager addClassNamed: customClassName
withSuperClassNamed: parentClassName
withActions: nil
@ -313,8 +326,11 @@
id src = [o source];
// Replace files owner with the document files owner for loading...
dest = [self _replaceProxyInstanceWithRealObject: dest];
src = [self _replaceProxyInstanceWithRealObject: src];
dest = [self _replaceProxyInstanceWithRealObject: dest
classManager: classManager];
src = [self _replaceProxyInstanceWithRealObject: src
classManager: classManager];
// Reset them...
[o setDestination: dest];