Some corrections to recently discovered bugs

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@19656 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2004-06-30 05:22:25 +00:00
parent ead6139314
commit 2552d4417c
4 changed files with 38 additions and 5 deletions

View file

@ -1,3 +1,11 @@
2004-06-30 23:14 Gregory John Casamento <greg_casamento@yahoo.com>
* GormDocument.m: [GormDocument loadDocument:] the application
was not picking up subclasses of GSNibItem (GormObjectProxy)
properly from version 0 files. I needed to add a loop which
iterates through the objects, since the GormObjectProxy doesn't
call the super class's initWithCoder: method.
2004-06-28 23:14 Gregory John Casamento <greg_casamento@yahoo.com>
* Gorm.m: -[Gorm testInterface:] changed awakeWithContext: call

View file

@ -156,7 +156,7 @@
// copy all actions from the class imported to the first responder
while((action = [e nextObject]))
{
if([self isSuperclass: @"NSResponder" linkedToClass: className])
// if([self isSuperclass: @"NSResponder" linkedToClass: className])
{
[self addAction: action forClassNamed: @"FirstResponder"];
}
@ -208,7 +208,7 @@
[[info objectForKey: @"AllActions"] insertObject: anAction atIndex: 0];
if(![className isEqualToString: @"FirstResponder"])
{
if([self isSuperclass: @"NSResponder" linkedToClass: className])
// if([self isSuperclass: @"NSResponder" linkedToClass: className])
{
[self addAction: anAction forClassNamed: @"FirstResponder"];
}
@ -303,7 +303,7 @@
if(![className isEqualToString: @"FirstResponder"])
{
if([self isSuperclass: @"NSResponder" linkedToClass: className])
// if([self isSuperclass: @"NSResponder" linkedToClass: className])
{
[self replaceAction: oldAction withAction: newAction forClassNamed: @"FirstResponder"];
}
@ -397,7 +397,7 @@
if(![className isEqualToString: @"FirstResponder"])
{
if([self isSuperclass: @"NSResponder" linkedToClass: className])
// if([self isSuperclass: @"NSResponder" linkedToClass: className])
{
[self removeAction: anAction fromClassNamed: @"FirstResponder"];
}

View file

@ -1646,10 +1646,12 @@ static NSImage *classesImage = nil;
else if ([name isEqual: IBClassNameChangedNotification] == YES)
{
[classesView reloadData];
[self touch];
}
else if ([name isEqual: IBInspectorDidModifyObjectNotification] == YES)
{
[classesView reloadData];
[self touch];
}
else if ([name isEqual: GormDidModifyClassNotification] == YES)
{
@ -1967,6 +1969,22 @@ static NSImage *classesImage = nil;
* Now we merge the objects from the nib container into our own data
* structures, taking care not to overwrite our NSOwner and NSFirst.
*/
if([u versionForClassName: NSStringFromClass([GSNibContainer class])] == 0)
{
id obj;
NSEnumerator *en = [nt objectEnumerator];
// get all of the GSNibItem subclasses which could be top level objects
while((obj = [en nextObject]) != nil)
{
if([obj isKindOfClass: [GSNibItem class]] &&
[obj isKindOfClass: [GSCustomView class]] == NO)
{
[topLevelObjects addObject: obj];
}
}
}
[nt removeObjectForKey: @"NSOwner"];
[nt removeObjectForKey: @"NSFirst"];
[topLevelObjects addObjectsFromArray: [[c topLevelObjects] allObjects]];
@ -1974,7 +1992,9 @@ static NSImage *classesImage = nil;
[nameTable addEntriesFromDictionary: nt];
[self rebuildObjToNameMapping];
// repair the .gorm file, if needed.
/*
* repair the .gorm file, if needed.
*/
if(repairFile == YES)
{
[self _repairFile];

View file

@ -41,7 +41,9 @@
- (void) controlTextDidEndEditing: (NSNotification*)aNotification
{
id<IBDocuments> doc = [(id<IB>)NSApp activeDocument];
[object setTitle: [titleText stringValue]];
[doc touch];
}
- (id) init
@ -165,6 +167,7 @@
- (void) controlTextDidEndEditing: (NSNotification*)aNotification
{
id o = [aNotification object];
id<IBDocuments> doc = [(id<IB>)NSApp activeDocument];
if (o == titleText)
{
@ -180,6 +183,8 @@
{
[object setTag: [tagText intValue]];
}
[doc touch];
[[object menu] display];
}