Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding workarounds for 10.4 only implementations

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-10-26 17:31:41 +00:00
parent 00bd8e7218
commit 2701ef7e86
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mac/carbon/graphics.cpp
View File

@@ -852,13 +852,23 @@ void wxMacCoreGraphicsMatrix::Invert()
// returns true if the elements of the transformation matrix are equal ? // returns true if the elements of the transformation matrix are equal ?
bool wxMacCoreGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const bool wxMacCoreGraphicsMatrix::IsEqual( const wxGraphicsMatrix* t) const
{ {
const CGAffineTransform* tm = (CGAffineTransform*) t->GetNativeMatrix();
return (
m_matrix.a == tm->a &&
m_matrix.b == tm->b &&
m_matrix.c == tm->c &&
m_matrix.d == tm->d &&
m_matrix.tx == tm->tx &&
m_matrix.ty == tm->ty ) ;
return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix())); return CGAffineTransformEqualToTransform(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()));
} }
// return true if this is the identity matrix // return true if this is the identity matrix
bool wxMacCoreGraphicsMatrix::IsIdentity() bool wxMacCoreGraphicsMatrix::IsIdentity()
{ {
return CGAffineTransformIsIdentity(m_matrix); return ( m_matrix.a == 1 && m_matrix.d == 1 &&
m_matrix.b == 0 && m_matrix.d == 0 && m_matrix.tx == 0 && m_matrix.ty == 0);
} }
// //
@@ -890,25 +900,18 @@ void wxMacCoreGraphicsMatrix::Rotate( wxDouble angle )
// applies that matrix to the point // applies that matrix to the point
void wxMacCoreGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y ) void wxMacCoreGraphicsMatrix::TransformPoint( wxDouble *x, wxDouble *y )
{ {
wxDouble x1, y1 ; CGPoint pt = CGPointApplyAffineTransform( CGPointMake(*x,*y), m_matrix);
x1 = m_matrix.a * (*x) + m_matrix.c * (*y) + m_matrix.tx ; *x = pt.x;
y1 = m_matrix.b * (*x) + m_matrix.d * (*y) + m_matrix.ty ; *y = pt.y;
*x = x1;
*y = y1;
} }
// applies the matrix except for translations // applies the matrix except for translations
void wxMacCoreGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy ) void wxMacCoreGraphicsMatrix::TransformDistance( wxDouble *dx, wxDouble *dy )
{ {
wxDouble x1, y1 ; CGSize sz = CGSizeApplyAffineTransform( CGSizeMake(*dx,*dy) , m_matrix );
*dx = sz.width;
x1 = m_matrix.a * (*dx) + m_matrix.c * (*dy); *dy = sz.height;
y1 = m_matrix.b * (*dx) + m_matrix.d * (*dy);
*dx = x1;
*dy = y1;
} }
// returns the native representation // returns the native representation