X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e32454eadc5b3c1763b79b8d08e97ac4bb59992c..66f75561893ea7b4bf429d1882d9cc0407ba932d:/src/osx/carbon/graphics.cpp?ds=inline diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp index 7362f96bcb..1afba4921d 100644 --- a/src/osx/carbon/graphics.cpp +++ b/src/osx/carbon/graphics.cpp @@ -1082,7 +1082,7 @@ wxGraphicsObjectRefData *wxMacCoreGraphicsMatrixData::Clone() const // concatenates the matrix void wxMacCoreGraphicsMatrixData::Concat( const wxGraphicsMatrixData *t ) { - m_matrix = CGAffineTransformConcat(m_matrix, *((CGAffineTransform*) t->GetNativeMatrix()) ); + m_matrix = CGAffineTransformConcat(*((CGAffineTransform*) t->GetNativeMatrix()), m_matrix ); } // sets the matrix to the respective values @@ -1545,7 +1545,7 @@ public : m_userOffset = CGContextConvertSizeToUserSpace( m_cg, CGSizeMake( 0.5 , 0.5 ) ); CGContextTranslateCTM( m_cg, m_userOffset.width , m_userOffset.height ); } - else + else { m_userOffset = CGSizeMake(0.0, 0.0); } @@ -2630,7 +2630,7 @@ void wxMacCoreGraphicsContext::ConcatTransform( const wxGraphicsMatrix& matrix ) if ( m_cgContext ) CGContextConcatCTM( m_cgContext, *(CGAffineTransform*) matrix.GetNativeMatrix()); else - m_windowTransform = CGAffineTransformConcat(m_windowTransform, *(CGAffineTransform*) matrix.GetNativeMatrix()); + m_windowTransform = CGAffineTransformConcat(*(CGAffineTransform*) matrix.GetNativeMatrix(), m_windowTransform); } // sets the transform of this context