* GormCore/GormBoxEditor.m: Check to see if the subview responds

to destroyAndListSubviews.
	* GormCore/GormViewWithContentViewEditor.m: 
	[GormViewWithContentViewEditor ungroup] added local
	variable "v" to hold the view.
	* Gorm.m: Remove NSLog from ungroup method.
	Partial correction for bug#17538.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@23341 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Gregory John Casamento 2006-08-27 05:39:47 +00:00
parent a1aac66d2c
commit a1f235be53
4 changed files with 22 additions and 4 deletions

View file

@ -1,3 +1,13 @@
2006-08-27 01:37-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormBoxEditor.m: Check to see if the subview responds
to destroyAndListSubviews.
* GormCore/GormViewWithContentViewEditor.m:
[GormViewWithContentViewEditor ungroup] added local
variable "v" to hold the view.
* Gorm.m: Remove NSLog from ungroup method.
Partial correction for bug#17538.
2006-08-20 12:23-EDT Gregory John Casamento <greg_casamento@yahoo.com>
* GormCore/GormDocument.m: Modify outdated "upgrade" warning in

2
Gorm.m
View file

@ -725,7 +725,7 @@
- (void) ungroup: (id)sender
{
NSLog(@"ungroup: selectionOwner %@", selectionOwner);
// NSLog(@"ungroup: selectionOwner %@", selectionOwner);
if ([selectionOwner respondsToSelector: @selector(ungroup)] == NO)
return;
[(GormGenericEditor *)selectionOwner ungroup];

View file

@ -230,7 +230,14 @@
{
if (contentViewEditor)
{
return [contentViewEditor destroyAndListSubviews];
if([contentViewEditor respondsToSelector: @selector(destroyAndListSubviews)])
{
return [contentViewEditor destroyAndListSubviews];
}
else
{
return nil;
}
}
else
{

View file

@ -1177,9 +1177,10 @@ int _sortViews(id view1, id view2, void *context)
views = [contentView destroyAndListSubviews];
for (i = 0; i < [views count]; i++)
{
[_editedObject addSubview: [views objectAtIndex: i]];
id v = [views objectAtIndex: i];
[_editedObject addSubview: v];
[newSelection addObject:
[document editorForObject: [views objectAtIndex: i]
[document editorForObject: v
inEditor: self
create: YES]];
}