Warning and if check fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14944 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2002-11-06 15:44:36 +00:00
parent 1f3d2e81a0
commit 5e12263244
3 changed files with 24 additions and 14 deletions

View file

@ -1,3 +1,21 @@
2002-11-06 Adam Fedor <fedor@gnu.org>
* Source/NSTableView.m ([NSTableView -drawRow:clipRect:]):Swapped
sides of while statement && operator to check for _numberOfColumns
first.
([NSTableView -drawGridInClipRect:]): Idem.
Also remove some unused variables.
2002-11-02 Lyndon Tremblay <humasect@shaw.ca>
* NSTableView.m ([NSTableView -columnAtPoint:]): Swapped sides of
while statement && operator to check for _numberOfColumns first.
2002-11-01 Lyndon Tremblay <humasect@shaw.ca>
* Source/NSBitmapImageRep.m ([NSBitmapImageRep -draw]): Cast
argument 11 for NSDrawBitmap() to remove warning.
2002-11-04 Adam Fedor <fedor@gnu.org> 2002-11-04 Adam Fedor <fedor@gnu.org>
* Source/NSWorkspace.m ([NSWorkspace -_workspaceApplication]): * Source/NSWorkspace.m ([NSWorkspace -_workspaceApplication]):

View file

@ -379,7 +379,7 @@
_isPlanar, _isPlanar,
_hasAlpha, _hasAlpha,
_colorSpace, _colorSpace,
_imagePlanes); (const unsigned char **)_imagePlanes);
return YES; return YES;
} }

View file

@ -3195,8 +3195,6 @@ _isCellEditable (id delegate, NSArray *tableColumns,
- (void) _selectColumn: (int)columnIndex - (void) _selectColumn: (int)columnIndex
modifiers: (unsigned int)modifiers modifiers: (unsigned int)modifiers
{ {
SEL selector;
if (_allowsColumnSelection == NO) if (_allowsColumnSelection == NO)
{ {
return; return;
@ -3755,8 +3753,6 @@ byExtendingSelection: (BOOL)flag
- (void) selectAll: (id) sender - (void) selectAll: (id) sender
{ {
SEL selector;
if (_allowsMultipleSelection == NO) if (_allowsMultipleSelection == NO)
return; return;
@ -3838,8 +3834,6 @@ byExtendingSelection: (BOOL)flag
- (void) deselectAll: (id) sender - (void) deselectAll: (id) sender
{ {
SEL selector;
if (_allowsEmptySelection == NO) if (_allowsEmptySelection == NO)
return; return;
@ -4177,7 +4171,6 @@ byExtendingSelection: (BOOL)flag
// Selection // Selection
if (clickCount == 1) if (clickCount == 1)
{ {
SEL selector;
unsigned int modifiers = [theEvent modifierFlags]; unsigned int modifiers = [theEvent modifierFlags];
BOOL startedPeriodicEvents = NO; BOOL startedPeriodicEvents = NO;
unsigned int eventMask = (NSLeftMouseUpMask unsigned int eventMask = (NSLeftMouseUpMask
@ -5066,7 +5059,7 @@ byExtendingSelection: (BOOL)flag
{ {
int i = 0; int i = 0;
while ((aPoint.x >= _columnOrigins[i]) && (i < _numberOfColumns)) while ((i < _numberOfColumns) && (aPoint.x >= _columnOrigins[i]))
{ {
i++; i++;
} }
@ -5627,7 +5620,7 @@ byExtendingSelection: (BOOL)flag
/* Determine starting column as fast as possible */ /* Determine starting column as fast as possible */
x_pos = NSMinX (clipRect); x_pos = NSMinX (clipRect);
i = 0; i = 0;
while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns)) while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
{ {
i++; i++;
} }
@ -5639,7 +5632,7 @@ byExtendingSelection: (BOOL)flag
/* Determine ending column as fast as possible */ /* Determine ending column as fast as possible */
x_pos = NSMaxX (clipRect); x_pos = NSMaxX (clipRect);
// Nota Bene: we do *not* reset i // Nota Bene: we do *not* reset i
while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns)) while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
{ {
i++; i++;
} }
@ -5695,7 +5688,7 @@ byExtendingSelection: (BOOL)flag
per drawn rect */ per drawn rect */
x_pos = minX; x_pos = minX;
i = 0; i = 0;
while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns)) while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
{ {
i++; i++;
} }
@ -5703,7 +5696,7 @@ byExtendingSelection: (BOOL)flag
x_pos = maxX; x_pos = maxX;
// Nota Bene: we do *not* reset i // Nota Bene: we do *not* reset i
while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns)) while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
{ {
i++; i++;
} }
@ -6844,7 +6837,6 @@ byExtendingSelection: (BOOL)flag
{ {
NSPoint p = [sender draggingLocation]; NSPoint p = [sender draggingLocation];
NSRect newRect; NSRect newRect;
NSTableViewDropOperation operation = NSTableViewDropAbove;
int row; int row;
int quarterPosition; int quarterPosition;
unsigned dragOperation; unsigned dragOperation;