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

Replace deprecated calls to NSAffineTransform

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24925 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-03-23 11:03:00 +00:00
parent f63c0258d2
commit 3658268df8
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2007-03-23 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSView.m: Replace calls to the now deprecated methods on
NSAffineTransform with correct ones.
2007-03-22 Fred Kiefer <FredKiefer@gmx.de> 2007-03-22 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSButtonCell.m (-drawWithFrame:inView:), * Source/NSButtonCell.m (-drawWithFrame:inView:),

30
Source/NSView.m
View file

@ -1313,8 +1313,8 @@ GSSetDragTypes(NSView* obj, NSArray *types)
* Plus - this is all pretty meaningless is we are not in a window! * Plus - this is all pretty meaningless is we are not in a window!
*/ */
matrix = [self _matrixToWindow]; matrix = [self _matrixToWindow];
aRect.origin = [matrix pointInMatrixSpace: aRect.origin]; aRect.origin = [matrix transformPoint: aRect.origin];
aRect.size = [matrix sizeInMatrixSpace: aRect.size]; aRect.size = [matrix transformSize: aRect.size];
aRect.origin.x = floor(aRect.origin.x); aRect.origin.x = floor(aRect.origin.x);
aRect.origin.y = floor(aRect.origin.y); aRect.origin.y = floor(aRect.origin.y);
@ -1322,8 +1322,8 @@ GSSetDragTypes(NSView* obj, NSArray *types)
aRect.size.height = floor(aRect.size.height); aRect.size.height = floor(aRect.size.height);
matrix = [self _matrixFromWindow]; matrix = [self _matrixFromWindow];
aRect.origin = [matrix pointInMatrixSpace: aRect.origin]; aRect.origin = [matrix transformPoint: aRect.origin];
aRect.size = [matrix sizeInMatrixSpace: aRect.size]; aRect.size = [matrix transformSize: aRect.size];
return aRect; return aRect;
} }
@ -1340,7 +1340,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
NSAssert(_window == [aView window], NSInvalidArgumentException); NSAssert(_window == [aView window], NSInvalidArgumentException);
matrix = [aView _matrixToWindow]; matrix = [aView _matrixToWindow];
new = [matrix pointInMatrixSpace: aPoint]; new = [matrix transformPoint: aPoint];
if (_coordinates_valid) if (_coordinates_valid)
{ {
@ -1350,7 +1350,7 @@ GSSetDragTypes(NSView* obj, NSArray *types)
{ {
matrix = [self _matrixFromWindow]; matrix = [self _matrixFromWindow];
} }
new = [matrix pointInMatrixSpace: new]; new = [matrix transformPoint: new];
return new; return new;
} }
@ -1378,9 +1378,9 @@ GSSetDragTypes(NSView* obj, NSArray *types)
{ {
matrix = [self _matrixToWindow]; matrix = [self _matrixToWindow];
} }
new = [matrix pointInMatrixSpace: aPoint]; new = [matrix transformPoint: aPoint];
matrix = [aView _matrixFromWindow]; matrix = [aView _matrixFromWindow];
new = [matrix pointInMatrixSpace: new]; new = [matrix transformPoint: new];
return new; return new;
} }
@ -1402,12 +1402,12 @@ static NSRect convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matri
p[3].y += aRect.size.height; p[3].y += aRect.size.height;
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
p[i] = [matrix1 pointInMatrixSpace: p[i]]; p[i] = [matrix1 transformPoint: p[i]];
min = max = p[0] = [matrix2 pointInMatrixSpace: p[0]]; min = max = p[0] = [matrix2 transformPoint: p[0]];
for (i = 1; i < 4; i++) for (i = 1; i < 4; i++)
{ {
p[i] = [matrix2 pointInMatrixSpace: p[i]]; p[i] = [matrix2 transformPoint: p[i]];
min.x = MIN(min.x, p[i].x); min.x = MIN(min.x, p[i].x);
min.y = MIN(min.y, p[i].y); min.y = MIN(min.y, p[i].y);
max.x = MAX(max.x, p[i].x); max.x = MAX(max.x, p[i].x);
@ -1508,7 +1508,7 @@ static NSRect convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matri
} }
NSAssert(_window == [aView window], NSInvalidArgumentException); NSAssert(_window == [aView window], NSInvalidArgumentException);
matrix = [aView _matrixToWindow]; matrix = [aView _matrixToWindow];
new = [matrix sizeInMatrixSpace: aSize]; new = [matrix transformSize: aSize];
if (_coordinates_valid) if (_coordinates_valid)
{ {
@ -1518,7 +1518,7 @@ static NSRect convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matri
{ {
matrix = [self _matrixFromWindow]; matrix = [self _matrixFromWindow];
} }
new = [matrix sizeInMatrixSpace: new]; new = [matrix transformSize: new];
return new; return new;
} }
@ -1545,10 +1545,10 @@ static NSRect convert_rect_using_matrices(NSRect aRect, NSAffineTransform *matri
{ {
matrix = [self _matrixToWindow]; matrix = [self _matrixToWindow];
} }
new = [matrix sizeInMatrixSpace: aSize]; new = [matrix transformSize: aSize];
matrix = [aView _matrixFromWindow]; matrix = [aView _matrixFromWindow];
new = [matrix sizeInMatrixSpace: new]; new = [matrix transformSize: new];
return new; return new;
} }