gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 13:10:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated for change in NSView ivars

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@5719 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
nico 2000-01-10 02:04:25 +00:00
parent 0a6a692734
commit 475b802dee
16 changed files with 169 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Source/NSControl.m
View file

@ -318,7 +318,7 @@ static Class cellClass;
{
if (_cell == aCell)
{
[_cell drawWithFrame: bounds inView: self];
[_cell drawWithFrame: _bounds inView: self];
}
}
@ -326,7 +326,7 @@ static Class cellClass;
{
if (_cell == aCell)
{
[_cell drawInteriorWithFrame: bounds
[_cell drawInteriorWithFrame: _bounds
inView: self];
}
}
@ -438,7 +438,7 @@ static Class cellClass;
else
oldActionMask = [_cell sendActionOn: NSPeriodicMask];
[window _captureMouse: self];
[_window _captureMouse: self];
e = theEvent;
while (!done) // loop until mouse goes up
@ -447,20 +447,20 @@ static Class cellClass;
location = [self convertPoint: location fromView: nil];
// ask the cell to track the mouse only
// if the mouse is within the cell
if ((location.x >= 0) && (location.x < bounds.size.width) &&
(location.y >= 0 && location.y < bounds.size.height))
if ((location.x >= 0) && (location.x < _bounds.size.width) &&
(location.y >= 0 && location.y < _bounds.size.height))
{
[_cell highlight: YES withFrame: bounds inView: self];
[window flushWindow];
[_cell highlight: YES withFrame: _bounds inView: self];
[_window flushWindow];
if ([_cell trackMouse: e
inRect: bounds
inRect: _bounds
ofView: self
untilMouseUp: [[_cell class] prefersTrackingUntilMouseUp]])
done = mouseUp = YES;
else
{
[_cell highlight: NO withFrame: bounds inView: self];
[window flushWindow];
[_cell highlight: NO withFrame: _bounds inView: self];
[_window flushWindow];
}
}
@ -476,13 +476,13 @@ static Class cellClass;
done = YES;
}
[window _releaseMouse: self];
[_window _releaseMouse: self];
if (mouseUp)
{
// [cell setState: ![cell state]];
[_cell highlight: NO withFrame: bounds inView: self];
[window flushWindow];
[_cell highlight: NO withFrame: _bounds inView: self];
[_window flushWindow];
}
[_cell sendActionOn: oldActionMask];
@ -493,7 +493,7 @@ static Class cellClass;
- (void) resetCursorRects
{
[_cell resetCursorRect: bounds inView: self];
[_cell resetCursorRect: _bounds inView: self];
}
- (BOOL) ignoresMultiClick