gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 08:30:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Source/NSTableView.m (-numberOfRows): Return the current number

Browse source 
of rows not the internal cached value.
  Replace some occurences of int with NSInteger
  and unsigned with NSUInteger.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@37461 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2013-12-13 15:08:32 +00:00
parent 1b478fabbf
commit 9600bd7614
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-12-13 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTableView.m (-numberOfRows): Return the current number
of rows not the internal cached value.
Replace some occurences of int with NSInteger
and unsigned with NSUInteger.
2013-12-08 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSClipView.m (-setBounds:, -setBoundsSize:): Use

28
Source/NSTableView.m
View file

@ -2102,7 +2102,7 @@ static void computeNewSelection
- (NSInteger) numberOfRows
{
return _numberOfRows;
return [self _numRows];
}
/*
@ -3050,7 +3050,7 @@ byExtendingSelection: (BOOL)flag
/* Ask the delegate if we can select all columns or rows */
if (_selectingColumns == YES)
{
if ([_selectedColumns count] == (unsigned)_numberOfColumns)
if ([_selectedColumns count] == (NSUInteger)_numberOfColumns)
{
// Nothing to do !
return;
@ -3070,14 +3070,14 @@ byExtendingSelection: (BOOL)flag
}
else // selecting rows
{
if ([_selectedRows count] == (unsigned)_numberOfRows)
if ([_selectedRows count] == (NSUInteger)_numberOfRows)
{
// Nothing to do !
return;
}
{
int row;
NSInteger row;
for (row = 0; row < _numberOfRows; row++)
{
@ -3314,7 +3314,7 @@ byExtendingSelection: (BOOL)flag
NSText *t;
NSTableColumn *tb;
NSRect drawingRect;
unsigned length = 0;
NSUInteger length = 0;
if (rowIndex != _selectedRow)
{
@ -4036,20 +4036,20 @@ static BOOL selectContiguousRegion(NSTableView *self,
return notified;
}
- (void) keyDown:(NSEvent *)theEvent
- (void) keyDown: (NSEvent *)theEvent
{
int oldRow = -1;
int currentRow = _selectedRow;
int originalRow = -1;
NSInteger oldRow = -1;
NSInteger currentRow = _selectedRow;
NSInteger originalRow = -1;
NSString *characters = [theEvent characters];
unsigned int len = [characters length];
unsigned int modifiers = [theEvent modifierFlags];
int rowHeight = [self rowHeight];
NSUInteger len = [characters length];
NSUInteger modifiers = [theEvent modifierFlags];
CGFloat rowHeight = [self rowHeight];
NSRect visRect = [self visibleRect];
BOOL modifySelection = YES;
NSPoint noModPoint = NSZeroPoint;
int visRows;
unsigned int i;
NSInteger visRows;
NSUInteger i;
BOOL gotMovementKey = NO;
// will not contain partial rows.