Updated for new way of getting borders

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5457 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 1999-12-13 02:35:01 +00:00
parent 60f56c5db3
commit 23dbc8be3e

View file

@ -196,7 +196,7 @@
[controlView lockFocus]; [controlView lockFocus];
NSDrawGrayBezel (cellFrame, NSZeroRect); NSDrawGrayBezel (cellFrame, NSZeroRect);
[controlView unlockFocus]; [controlView unlockFocus];
[self drawInteriorWithFrame: cellFrame inView: controlView]; [super drawInteriorWithFrame: cellFrame inView: controlView];
} }
@end @end
@ -1152,7 +1152,7 @@
sw = [NSScroller scrollerWidth]; sw = [NSScroller scrollerWidth];
// Take the border into account // Take the border into account
if (_separatesColumns) if (_separatesColumns)
sw += 2 * [NSCell sizeForBorderType: NSBezelBorder].width; sw += 2 * (_sizeForBorderType (NSBezelBorder)).width;
// Column width cannot be less than scroller and border // Column width cannot be less than scroller and border
if (columnWidth < sw) if (columnWidth < sw)
@ -1321,7 +1321,7 @@
- (float)titleHeight - (float)titleHeight
{ {
NSSize bs = [NSCell sizeForBorderType: NSBezelBorder]; NSSize bs = _sizeForBorderType (NSBezelBorder);
#if defined NSBTRACE_titleHeight || defined NSBTRACE_all #if defined NSBTRACE_titleHeight || defined NSBTRACE_all
fprintf(stderr, "NSBrowser - (void)titleHeight\n"); fprintf(stderr, "NSBrowser - (void)titleHeight\n");
@ -1675,7 +1675,7 @@
- (NSRect)frameOfColumn: (int)column - (NSRect)frameOfColumn: (int)column
{ {
NSRect r = NSZeroRect; NSRect r = NSZeroRect;
NSSize bs = [NSCell sizeForBorderType: NSBezelBorder]; NSSize bs = _sizeForBorderType (NSBezelBorder);
int n; int n;
//#define NSBTRACE_frameOfColumn //#define NSBTRACE_frameOfColumn
@ -1744,7 +1744,7 @@
- (void)tile - (void)tile
{ {
NSSize bs = [NSCell sizeForBorderType: NSBezelBorder]; NSSize bs = _sizeForBorderType (NSBezelBorder);
int i, num = _maxVisibleColumns; int i, num = _maxVisibleColumns;
id bc, sc; id bc, sc;
@ -2119,7 +2119,7 @@
_browserDelegate = nil; _browserDelegate = nil;
_passiveDelegate = YES; _passiveDelegate = YES;
_doubleAction = NULL; _doubleAction = NULL;
bs = [NSCell sizeForBorderType: NSBezelBorder]; bs = _sizeForBorderType (NSBezelBorder);
_minColumnWidth = [NSScroller scrollerWidth] + (2 * bs.width); _minColumnWidth = [NSScroller scrollerWidth] + (2 * bs.width);
// Horizontal scroller // Horizontal scroller
@ -2261,7 +2261,7 @@
if (_hasHorizontalScroller) if (_hasHorizontalScroller)
{ {
NSRect scrollerBorderRect = _scrollerRect; NSRect scrollerBorderRect = _scrollerRect;
NSSize bs = [NSCell sizeForBorderType: NSBezelBorder]; NSSize bs = _sizeForBorderType (NSBezelBorder);
scrollerBorderRect.origin.x = 0; scrollerBorderRect.origin.x = 0;
scrollerBorderRect.origin.y = 0; scrollerBorderRect.origin.y = 0;