Remove of action/outlet/class now acts correctly when user cancels.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@15568 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2003-01-09 07:03:36 +00:00
parent 7801ab1a9c
commit d0d355ec92
2 changed files with 24 additions and 8 deletions

View file

@ -1,3 +1,10 @@
2003-01-09 Gregory John Casamento <greg_casamento@yahoo.com
* GormDocument.m: [GormDocument remove:]: added code
to check the boolean returned from the removeConnection
methods. If the result is NO, dont proceed with the
delete.
2003-01-09 Gregory John Casamento <greg_casamento@yahoo.com
* GormDocument.m: [GormDocument remove:]: added code

View file

@ -970,9 +970,12 @@ static NSImage *classesImage = nil;
BOOL removed = [self removeConnectionsWithLabel: name
forClassNamed: itemBeingEdited
isAction: YES];
[classManager removeAction: name
fromClassNamed: itemBeingEdited];
[classesView removeItemAtRow: i];
if(removed)
{
[classManager removeAction: name
fromClassNamed: itemBeingEdited];
[classesView removeItemAtRow: i];
}
}
}
else if([classesView editType] == Outlets)
@ -985,9 +988,12 @@ static NSImage *classesImage = nil;
BOOL removed = [self removeConnectionsWithLabel: name
forClassNamed: itemBeingEdited
isAction: NO];
[classManager removeOutlet: name
fromClassNamed: itemBeingEdited];
[classesView removeItemAtRow: i];
if(removed)
{
[classManager removeOutlet: name
fromClassNamed: itemBeingEdited];
[classesView removeItemAtRow: i];
}
}
}
}
@ -1002,8 +1008,11 @@ static NSImage *classesImage = nil;
if([classManager isCustomClass: anitem])
{
BOOL removed = [self removeConnectionsForClassNamed: anitem];
[classManager removeClassNamed: anitem];
[classesView reloadData];
if(removed)
{
[classManager removeClassNamed: anitem];
[classesView reloadData];
}
}
}
else