Index: NSMatrix.m
===================================================================
--- NSMatrix.m	(revision 24917)
+++ NSMatrix.m	(working copy)
@@ -174,8 +174,6 @@
 				    column: (int)column;
 - (BOOL) _selectPreviousSelectableCellBeforeRow: (int)row
 					 column: (int)column;
-- (void) _drawCellAtRow: (int)row 
-                 column: (int)column;
 - (void) _setKeyRow: (int) row
              column: (int) column;
 @end
@@ -2036,7 +2034,7 @@
   for (i = row1; i <= row2 && i < _numRows; i++)
     for (j = col1; j <= col2 && j < _numCols; j++)
       {
-	[self _drawCellAtRow: i column: j];
+	[self drawCellAtRow: i column: j];
       }
 }
 
@@ -2076,31 +2074,23 @@
 	}
       
       if (_drawsCellBackground)
-	{
 	  [_cellBackgroundColor set];
-	  NSRectFill(cellFrame);
-	}
       else
-	{
 	  [_backgroundColor set];
-	  NSRectFill(cellFrame);
-	}
+      NSRectFill(cellFrame);
       
-      if (_dottedRow == row
-          && _dottedColumn == column
+      if (_dottedRow == row && _dottedColumn == column
 	  && [aCell acceptsFirstResponder]
-          && [_window isKeyWindow]
-	  && [_window firstResponder] == self)
+          && [_window isKeyWindow] && [_window firstResponder] == self)
 	{
 	  [aCell setShowsFirstResponder: YES];
-          [aCell drawWithFrame: cellFrame inView: self];
-          [aCell setShowsFirstResponder: NO];
 	}
       else
 	{
 	  [aCell setShowsFirstResponder: NO];
-          [aCell drawWithFrame: cellFrame inView: self];
 	}
+      [aCell drawWithFrame: cellFrame inView: self];
+      [aCell setShowsFirstResponder: NO];
     }
 }
 
@@ -4095,40 +4085,6 @@
   return NO;
 }
 
-- (void) _drawCellAtRow: (int)row column: (int)column
-{
-  NSCell *aCell = [self cellAtRow: row column: column];
-
-  if (aCell)
-    {
-      NSRect cellFrame = [self cellFrameAtRow: row column: column];
-
-      // we don't need to draw the matrix's background
-      // as it has already been done in drawRect: if needed
-      // (this method is only called by drawRect:)
-      if (_drawsCellBackground)
-	{
-	  [_cellBackgroundColor set];
-	  NSRectFill(cellFrame);
-	}
-
-      if (_dottedRow == row && _dottedColumn == column
-	  && [aCell acceptsFirstResponder])
-	{
-	  [aCell
-	    setShowsFirstResponder: ([_window isKeyWindow]
-				     && [_window firstResponder] == self)];
-	}
-      else
-        {
-	  [aCell setShowsFirstResponder: NO];
-	}
-      
-      [aCell drawWithFrame: cellFrame inView: self];
-      [aCell setShowsFirstResponder: NO];
-    }
-}
-
 - (void) _setKeyRow: (int)row column: (int)column
 {
   if (_dottedRow == row && _dottedColumn == column)