Minor browser column fix. Change some methods to take void *

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14663 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fedor 2002-10-07 17:05:06 +00:00
parent 9b79751a63
commit 4aba3cb17a
4 changed files with 22 additions and 15 deletions

View file

@ -1,3 +1,14 @@
2002-10-07 Adam Fedor <fedor@gnu.org>
* Source/NSBrowser.m (-frameOfColumn:, -tile): Change distance
between columns from 1 to 2. (Patch from Serg Stoyan
<stoyan@hologr.com>)
* Source/NSGraphicsContext.m (-GSSetFillColorspace:):Take
void * argument
(-GSSetStrokeColorspace:): Idem.
(-GSSetFont:): Idem.
2002-10-06 Gregory John Casamento <greg_casamento@yahoo.com> 2002-10-06 Gregory John Casamento <greg_casamento@yahoo.com>
* Source/NSBundleAdditions.m: Implemented the following classes: * Source/NSBundleAdditions.m: Implemented the following classes:

View file

@ -227,8 +227,8 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext();
- (void) DPSsethsbcolor: (float)h : (float)s : (float)b; - (void) DPSsethsbcolor: (float)h : (float)s : (float)b;
- (void) DPSsetrgbcolor: (float)r : (float)g : (float)b; - (void) DPSsetrgbcolor: (float)r : (float)g : (float)b;
- (void) GSSetFillColorspace: (NSDictionary *)dict; - (void) GSSetFillColorspace: (void *)spaceref;
- (void) GSSetStrokeColorspace: (NSDictionary *)dict; - (void) GSSetStrokeColorspace: (void *)spaceref;
- (void) GSSetFillColor: (float *)values; - (void) GSSetFillColor: (float *)values;
- (void) GSSetStrokeColor: (float *)values; - (void) GSSetStrokeColor: (float *)values;
@ -246,7 +246,7 @@ APPKIT_EXPORT NSGraphicsContext *GSCurrentContext();
- (void) DPSyshow: (const char*)s : (const float*)numarray : (int)size; - (void) DPSyshow: (const char*)s : (const float*)numarray : (int)size;
- (void) GSSetCharacterSpacing: (float)extra; - (void) GSSetCharacterSpacing: (float)extra;
- (void) GSSetFont: (NSFont*)font; - (void) GSSetFont: (void *)fontref;
- (void) GSSetFontSize: (float)size; - (void) GSSetFontSize: (float)size;
- (NSAffineTransform *) GSGetTextCTM; - (NSAffineTransform *) GSGetTextCTM;
- (NSPoint) GSGetTextPosition; - (NSPoint) GSGetTextPosition;

View file

@ -1509,9 +1509,9 @@ static NSTextFieldCell *titleCell;
if (_hasHorizontalScroller) if (_hasHorizontalScroller)
{ {
if (_separatesColumns) if (_separatesColumns)
r.origin.y = (scrollerWidth - 2) + (2 * bs.height) + NSBR_VOFFSET; r.origin.y = (scrollerWidth - 1) + (2 * bs.height) + NSBR_VOFFSET;
else else
r.origin.y = scrollerWidth + 2; r.origin.y = scrollerWidth + bs.width;
} }
// Padding : _columnSize.width is rounded in "tile" method // Padding : _columnSize.width is rounded in "tile" method
@ -1571,17 +1571,13 @@ static NSTextFieldCell *titleCell;
if (_hasHorizontalScroller) if (_hasHorizontalScroller)
{ {
_scrollerRect.origin.x = bs.width; _scrollerRect.origin.x = bs.width;
// if (_separatesColumns)
// _scrollerRect.origin.y = bs.height;
// else
_scrollerRect.origin.y = bs.height - 1; _scrollerRect.origin.y = bs.height - 1;
_scrollerRect.size.width = (_frame.size.width - (2 * bs.width)) + 1; _scrollerRect.size.width = (_frame.size.width - (2 * bs.width)) + 1;
_scrollerRect.size.height = scrollerWidth; _scrollerRect.size.height = scrollerWidth;
if (_separatesColumns) if (_separatesColumns)
_columnSize.height -= (scrollerWidth - 2) + (2 * bs.height) + NSBR_VOFFSET; _columnSize.height -= (scrollerWidth - 1) + (2 * bs.height)
+ NSBR_VOFFSET;
else else
_columnSize.height -= scrollerWidth + (2 * bs.height); _columnSize.height -= scrollerWidth + (2 * bs.height);

View file

@ -772,7 +772,7 @@ NSGraphicsContext *GSCurrentContext()
using the GSColorSpaceName key.</p> using the GSColorSpaceName key.</p>
<p>Other colorspaces will be documented later (Quartz). </p> <p>Other colorspaces will be documented later (Quartz). </p>
*/ */
- (void) GSSetFillColorspace: (NSDictionary *)dict - (void) GSSetFillColorspace: (void *)spaceref
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -780,7 +780,7 @@ NSGraphicsContext *GSCurrentContext()
/** Sets the colorspace for stroke operations based on the values in /** Sets the colorspace for stroke operations based on the values in
the supplied dictionary. See -GSSetFillColorspace: for a the supplied dictionary. See -GSSetFillColorspace: for a
description of the values that need to be supplied (Quartz). */ description of the values that need to be supplied (Quartz). */
- (void) GSSetStrokeColorspace: (NSDictionary *)dict - (void) GSSetStrokeColorspace: (void *)spaceref
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
@ -883,8 +883,8 @@ NSGraphicsContext *GSCurrentContext()
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }
/** Set the current NSFont object for drawing glyphs. (DPS, Quartz). */ /** Set the current font for drawing glyphs. (DPS, Quartz). */
- (void) GSSetFont: (NSFont*)font - (void) GSSetFont: (void *)fontref
{ {
[self subclassResponsibility: _cmd]; [self subclassResponsibility: _cmd];
} }