Merge from 0.6.5

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@6040 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2000-02-19 00:40:47 +00:00
parent 6b5e33078b
commit f34100ac45
42 changed files with 2343 additions and 1170 deletions

View file

@ -348,6 +348,8 @@ static SEL getSel = @selector(objectAtIndex:);
cells[i][column] = old;
selectedCells[i][column] = NO;
}
if (_selectedCell && (_selectedColumn >= column))
_selectedColumn++;
}
/*
@ -425,6 +427,8 @@ static SEL getSel = @selector(objectAtIndex:);
}
cells[row] = oldr;
selectedCells[row] = olds;
if (_selectedCell && (_selectedRow >= row))
_selectedRow++;
}
/*
@ -501,7 +505,13 @@ static SEL getSel = @selector(objectAtIndex:);
[NSException raise: NSRangeException
format: @"attempt to put cell outside matrix bounds"];
}
if ((row == _selectedRow) && (column == _selectedColumn)
&& (_selectedCell != nil))
_selectedCell = newCell;
ASSIGN(cells[row][column], newCell);
[self setNeedsDisplayInRect: [self cellFrameAtRow: row column: column]];
}
@ -1780,6 +1790,15 @@ static SEL getSel = @selector(objectAtIndex:);
static MPoint anchor = {0, 0};
int clickCount;
/*
* Pathological case -- ignore mouse down
*/
if ((numRows == 0) || (numCols == 0))
{
[super mouseDown: theEvent];
return;
}
// Manage multi-click events
clickCount = [theEvent clickCount];