From 5e12263244af55c15fbdc2eeebd012ef1b2fce51 Mon Sep 17 00:00:00 2001
From: Adam Fedor <fedor@gnu.org>
Date: Wed, 6 Nov 2002 15:44:36 +0000
Subject: [PATCH] Warning and if check fixes

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14944 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 | 18 ++++++++++++++++++
 Source/NSBitmapImageRep.m |  2 +-
 Source/NSTableView.m      | 18 +++++-------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de7f1f779..f25219d01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* Source/NSWorkspace.m ([NSWorkspace -_workspaceApplication]): 
diff --git a/Source/NSBitmapImageRep.m b/Source/NSBitmapImageRep.m
index f7791be95..f1eea455e 100644
--- a/Source/NSBitmapImageRep.m
+++ b/Source/NSBitmapImageRep.m
@@ -379,7 +379,7 @@
 	       _isPlanar,
 	       _hasAlpha,
 	       _colorSpace,
-	       _imagePlanes);
+	       (const unsigned char **)_imagePlanes);
   return YES;
 }
 
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index a1ce0706b..f1e7b5bac 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -3195,8 +3195,6 @@ _isCellEditable (id delegate, NSArray *tableColumns,
 - (void) _selectColumn: (int)columnIndex
 	     modifiers: (unsigned int)modifiers
 {
-  SEL selector;
-
   if (_allowsColumnSelection == NO)
     {
       return;
@@ -3755,8 +3753,6 @@ byExtendingSelection: (BOOL)flag
 
 - (void) selectAll: (id) sender
 {
-  SEL selector; 
-
   if (_allowsMultipleSelection == NO)
     return;
 
@@ -3838,8 +3834,6 @@ byExtendingSelection: (BOOL)flag
 
 - (void) deselectAll: (id) sender
 {
-  SEL selector; 
-
   if (_allowsEmptySelection == NO)
     return;
 
@@ -4177,7 +4171,6 @@ byExtendingSelection: (BOOL)flag
   // Selection
   if (clickCount == 1)
     {
-      SEL selector;
       unsigned int modifiers = [theEvent modifierFlags];
       BOOL startedPeriodicEvents = NO;
       unsigned int eventMask = (NSLeftMouseUpMask 
@@ -5066,7 +5059,7 @@ byExtendingSelection: (BOOL)flag
     {
       int i = 0;
       
-      while ((aPoint.x >= _columnOrigins[i]) && (i < _numberOfColumns))
+      while ((i < _numberOfColumns) && (aPoint.x >= _columnOrigins[i]))
 	{
 	  i++;
 	}
@@ -5627,7 +5620,7 @@ byExtendingSelection: (BOOL)flag
   /* Determine starting column as fast as possible */
   x_pos = NSMinX (clipRect);
   i = 0;
-  while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns))
+  while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
     {
       i++;
     }
@@ -5639,7 +5632,7 @@ byExtendingSelection: (BOOL)flag
   /* Determine ending column as fast as possible */
   x_pos = NSMaxX (clipRect);
   // Nota Bene: we do *not* reset i
-  while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns))
+  while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
     {
       i++;
     }
@@ -5695,7 +5688,7 @@ byExtendingSelection: (BOOL)flag
      per drawn rect */
   x_pos = minX;
   i = 0;
-  while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns))
+  while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
     {
       i++;
     }
@@ -5703,7 +5696,7 @@ byExtendingSelection: (BOOL)flag
 
   x_pos = maxX;
   // Nota Bene: we do *not* reset i
-  while ((x_pos > _columnOrigins[i]) && (i < _numberOfColumns))
+  while ((i < _numberOfColumns) && (x_pos > _columnOrigins[i]))
     {
       i++;
     }
@@ -6844,7 +6837,6 @@ byExtendingSelection: (BOOL)flag
 {
   NSPoint p = [sender draggingLocation];
   NSRect newRect;
-  NSTableViewDropOperation operation = NSTableViewDropAbove;
   int row;
   int quarterPosition;
   unsigned dragOperation;