mirror of
https://github.com/gnustep/libs-gui.git
synced 2025-05-30 18:00:37 +00:00
Merged in 'dawn' CVS branch
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@3827 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
ac6ec019f7
commit
55b55d3fee
65 changed files with 794 additions and 774 deletions
|
@ -58,8 +58,8 @@
|
|||
static NSString *viewThreadKey = @"NSViewThreadKey";
|
||||
static NSAffineTransform *flip = nil;
|
||||
|
||||
static void (*concatImp)(NSAffineTransform*, SEL, NSAffineTransform*) = 0;
|
||||
static SEL concatSel = @selector(concatenateWith:);
|
||||
static void (*appImp)(NSAffineTransform*, SEL, NSAffineTransform*) = 0;
|
||||
static SEL appSel = @selector(appendTransform:);
|
||||
|
||||
static void (*invalidateImp)(NSView*, SEL) = 0;
|
||||
static SEL invalidateSel = @selector(_invalidateCoordinates);
|
||||
|
@ -74,8 +74,8 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
|
|||
Class matrixClass = [NSAffineTransform class];
|
||||
NSAffineTransformStruct ats = { 1, 0, 0, -1, 0, 1 };
|
||||
|
||||
concatImp = (void (*)(NSAffineTransform*, SEL, NSAffineTransform*))
|
||||
[matrixClass instanceMethodForSelector: concatSel];
|
||||
appImp = (void (*)(NSAffineTransform*, SEL, NSAffineTransform*))
|
||||
[matrixClass instanceMethodForSelector: appSel];
|
||||
|
||||
invalidateImp = (void (*)(NSView*, SEL))
|
||||
[self instanceMethodForSelector: invalidateSel];
|
||||
|
@ -1879,13 +1879,13 @@ static SEL invalidateSel = @selector(_invalidateCoordinates);
|
|||
|
||||
[pMatrix getMatrix: vals];
|
||||
[matrixToWindow setMatrix: vals];
|
||||
(*concatImp)(matrixToWindow, concatSel, frameMatrix);
|
||||
(*appImp)(matrixToWindow, appSel, frameMatrix);
|
||||
if ([self isFlipped] != wasFlipped)
|
||||
{
|
||||
flip->matrix.ty = bounds.size.height;
|
||||
(*concatImp)(matrixToWindow, concatSel, flip);
|
||||
(*appImp)(matrixToWindow, appSel, flip);
|
||||
}
|
||||
(*concatImp)(matrixToWindow, concatSel, boundsMatrix);
|
||||
(*appImp)(matrixToWindow, appSel, boundsMatrix);
|
||||
[matrixToWindow getMatrix: vals];
|
||||
[matrixFromWindow setMatrix: vals];
|
||||
[matrixFromWindow inverse];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue