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

Fixes to prevent crash when loading XIB containing an NSMatrix object

Browse source
This commit is contained in:
Gregory John Casamento 2023-08-27 10:35:57 -04:00
parent 8b9e998251
commit 87286cdf55
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
GormCore/Plugins/Xib/GormXIBModelGenerator.m
View file

@ -1084,8 +1084,6 @@ static NSUInteger _count = INT_MAX;
- (void) _addCellsFromMatrix: (NSMatrix *)matrix toElement: (NSXMLElement *)elem
{
NSLog(@"cells = %@\nelem = %@", [matrix cells], elem);
NSRect rect = [matrix frame];
NSSize cellSize = [matrix cellSize];
NSSize inter = [matrix intercellSpacing];
@ -1096,7 +1094,11 @@ static NSUInteger _count = INT_MAX;
NSArray *cells = [matrix cells];
NSUInteger i = 0;
NSXMLElement *cellsElem = [NSXMLNode elementWithName: @"cells"];
NSString *cellClass = nil;
NSDebugLog(@"cells = %@\nelem = %@", [matrix cells], elem);
NSLog(@"WARNING: NSMatrix is not fully supported by Xcode, this might cause it to crash or may not be reloadable by this application");
[elem addChild: cellsElem];
for (c = 0; c < itemsPerCol; c++)
{
@ -1108,11 +1110,28 @@ static NSUInteger _count = INT_MAX;
i = (c * itemsPerCol) + r;
cell = [cells objectAtIndex: i];
if (cellClass == nil)
{
cellClass = NSStringFromClass([cell class]);
}
[self _collectObjectsFromObject: cell
withNode: columnElem];
}
[cellsElem addChild: columnElem];
}
// Add the cell class, so that it doesn't crash on reload...
if (cellClass != nil)
{
NSXMLNode *attr = [NSXMLNode attributeWithName: @"cellClass" stringValue: cellClass];
[elem addAttribute: attr];
}
else
{
NSXMLNode *attr = [NSXMLNode attributeWithName: @"cellClass" stringValue: @"NSButtonCell"];
[elem addAttribute: attr];
}
}
- (void) _addProperty: (NSString *)name

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

@ -432,7 +432,13 @@
className = [classManager nonCustomSuperClassOf: className];
}
clz = [unarchiver classForClassName: className];
// [obj setBaseWindowClass: clz];
}
else if ([obj isKindOfClass: [NSMatrix class]])
{
if ([obj cellClass] == NULL)
{
[obj setCellClass: [NSButtonCell class]];
}
}
else if ([obj respondsToSelector: @selector(setTarget:)] &&
[obj respondsToSelector: @selector(setAction:)] &&