--- CVS/core/gui/Source/NSBrowser.m	Mon Sep 23 01:10:50 2002
+++ gui/Source/NSBrowser.m	Thu Oct  3 03:23:58 2002
@@ -51,6 +51,7 @@
 #include <AppKit/NSTableHeaderCell.h>
 #include <AppKit/NSEvent.h>
 #include <AppKit/NSWindow.h>
+#include <AppKit/NSBezierPath.h>
 
 DEFINE_RINT_IF_MISSING
 
@@ -58,7 +59,7 @@
 static float scrollerWidth; // == [NSScroller scrollerWidth]
 static NSTextFieldCell *titleCell;
 
-#define NSBR_COLUMN_SEP 6
+#define NSBR_COLUMN_SEP 4
 #define NSBR_VOFFSET 2
 
 #define NSBR_COLUMN_IS_VISIBLE(i) \
@@ -1096,11 +1097,27 @@
 /** Sets whether to separate columns with bezeled borders. */
 - (void) setSeparatesColumns: (BOOL)flag
 {
-  if (_separatesColumns != flag)
+  NSBrowserColumn *bc;
+  NSScrollView    *sc;
+  NSBorderType    bt;
+  int             i, columnCount;
+
+  // if this flag already set or browser is titled -- do nothing
+  if (_separatesColumns == flag || _isTitled)
+	return;
+
+  columnCount = [_browserColumns count];
+  bt = flag ? NSBezelBorder : NSNoBorder;
+  for (i = 0; i < columnCount; i++)
     {
+	  bc = [_browserColumns objectAtIndex: i];
+	  sc = [bc columnScrollView];
+	  [sc setBorderType:bt];
+	}
+  
       _separatesColumns = flag;
+  [self setNeedsDisplay:YES];
       [self tile];
-    }
 }
 
 /** Returns YES if the title of a column is set to the string value of 
@@ -1162,12 +1179,12 @@
 /** Sets whether columns display titles. */
 - (void) setTitled: (BOOL)flag
 {
-  if (_isTitled != flag)
-    {
+  if (_isTitled == flag || !_separatesColumns)
+	return;
+
       _isTitled = flag;
       [self tile];
       [self setNeedsDisplay: YES];
-    }
 }
 
 - (void) drawTitleOfColumn: (int)column 
@@ -1480,17 +1497,31 @@
     {
       r.origin.x += n * NSBR_COLUMN_SEP;
     }
+  else
+	{
+	  if (column == _firstVisibleColumn)
+        r.origin.x = (n * _columnSize.width) + bs.width;
+	  else
+		r.origin.x = (n * _columnSize.width) + (n + bs.width);
+	}
 
   // Adjust for horizontal scroller
   if (_hasHorizontalScroller)
     {
+	  if (_separatesColumns)
       r.origin.y = scrollerWidth + (2 * bs.height) + NSBR_VOFFSET;
+	  else
+		r.origin.y = scrollerWidth + bs.width + 1;
     }
 
   // Padding : _columnSize.width is rounded in "tile" method
   if (column == _lastVisibleColumn)
     {
+	  if (_separatesColumns)
       r.size.width = _frame.size.width - r.origin.x;
+	  else
+		r.size.width = _frame.size.width 
+		  - (r.origin.x + (2 * bs.width) + ([self numberOfVisibleColumns] - 1));
     }
 
   if (r.size.width < 0)
@@ -1526,6 +1557,7 @@
 {
   NSSize bs = _sizeForBorderType (NSBezelBorder);
   int i, num, columnCount, delta;
+  float  frameWidth;
 
   _columnSize.height = _frame.size.height;
   
@@ -1539,11 +1571,14 @@
   if (_hasHorizontalScroller)
     {
       _scrollerRect.origin.x = bs.width;
-      _scrollerRect.origin.y = bs.height;
+	  _scrollerRect.origin.y = bs.height - 1;
       _scrollerRect.size.width = _frame.size.width - (2 * bs.width);
       _scrollerRect.size.height = scrollerWidth;
 
+ 	  if (_separatesColumns)
       _columnSize.height -= scrollerWidth + (2 * bs.height) + NSBR_VOFFSET;
+ 	  else
+ 		_columnSize.height -= scrollerWidth + (2 * bs.height) + 1;
 
       if (!NSEqualRects(_scrollerRect, [_horizontalScroller frame]))
         {
@@ -1598,15 +1633,11 @@
 
   // Columns
   if (_separatesColumns)
-    {
-      _columnSize.width = (int)((_frame.size.width - ((columnCount - 1)
-						      * NSBR_COLUMN_SEP)) 
-				/ (float)columnCount);
-    }
+      frameWidth = _frame.size.width - ((columnCount - 1) * NSBR_COLUMN_SEP);
   else
-    {
-      _columnSize.width = (int)(_frame.size.width / (float)columnCount);
-    }
+      frameWidth = _frame.size.width - (columnCount + (2 * bs.width));
+
+  _columnSize.width = (int)(frameWidth / (float)columnCount);
 
   if (_columnSize.height < 0)
     _columnSize.height = 0;
@@ -1862,7 +1893,7 @@
     {
       // Initial version
       [self setVersion: 1];
-      scrollerWidth = [NSScroller scrollerWidth];
+      scrollerWidth = [NSScroller scrollerWidth] - 1;
       titleCell = [GSBrowserTitleCell new];
     }
 }
@@ -1926,6 +1957,7 @@
   _lastColumnLoaded = -1;
   _firstVisibleColumn = 0;
   _lastVisibleColumn = 0;
+  _maxVisibleColumns = 3;
   [self _createColumn];
 
   return self;
@@ -1980,6 +2012,8 @@
 
 - (void) drawRect: (NSRect)rect
 {
+  NSSize bs = _sizeForBorderType (NSBezelBorder);
+
   NSRectClip(rect);
   [[_window backgroundColor] set];
   NSRectFill(rect);
@@ -2015,13 +2049,41 @@
       scrollerBorderRect.origin.x = 0;
       scrollerBorderRect.origin.y = 0;
       scrollerBorderRect.size.width += 2 * bs.width;
-      scrollerBorderRect.size.height += 2 * bs.height;
+      scrollerBorderRect.size.height += (2 * bs.height);
 
       if ((NSIntersectsRect (scrollerBorderRect, rect) == YES) && _window)
       	{
       	  NSDrawGrayBezel (scrollerBorderRect, rect);
 	}
     }
+
+  if (!_separatesColumns)
+	{
+	  NSPoint p1,p2;
+ 	  NSRect  browserRect;
+	  int     i, visibleColumns;
+
+	  // Columns
+ 	  browserRect = NSMakeRect(0, 0, rect.size.width, rect.size.height);
+	  NSDrawGrayBezel (browserRect, rect);
+
+	  [[NSColor blackColor] set];
+	  visibleColumns = [self numberOfVisibleColumns]; 
+	  for (i = 1; i < visibleColumns; i++)
+		{
+		  p1 = NSMakePoint((_columnSize.width * i) + bs.width + (i-1), 
+						   _columnSize.height + scrollerWidth + (2*bs.width));
+		  p2 = NSMakePoint((_columnSize.width * i) + bs.width + (i-1), 
+						   scrollerWidth + (2*bs.width));
+		  [NSBezierPath strokeLineFromPoint: p1 toPoint: p2];
+		}
+
+	  // Horizontal scroller
+	  p1 = NSMakePoint(bs.width, scrollerWidth + bs.width + 1);
+	  p2 = NSMakePoint(rect.size.width - bs.width, 
+					   scrollerWidth + bs.width + 1);
+	  [NSBezierPath strokeLineFromPoint: p1 toPoint: p2];
+	}
 }
 
 /* Informs the receivers's subviews that the receiver's bounds