fixing text matrix (dataview custom renderer showed problems) and reordering SaveGState

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/carbon/graphics.cpp b/src/osx/carbon/graphics.cpp
index d5f4f7e7045c24073ba2bd87f2090ef49b11d77d..5389a37e141a0f0addaa8494816ca829faa53e90 100644 (file)
--- a/src/osx/carbon/graphics.cpp
+++ b/src/osx/carbon/graphics.cpp
@@ -1625,8 +1625,9 @@ bool wxMacCoreGraphicsContext::EnsureIsValid()
 #endif
         if ( m_cgContext )
         {
 #endif
         if ( m_cgContext )
         {

-            CGContextConcatCTM( m_cgContext, m_windowTransform );

             CGContextSaveGState( m_cgContext );
             CGContextSaveGState( m_cgContext );

+            CGContextConcatCTM( m_cgContext, m_windowTransform );
+            CGContextSetTextMatrix( m_cgContext, CGAffineTransformIdentity );

             m_contextSynthesized = true;
 #if wxOSX_USE_COCOA_OR_CARBON
             if ( m_clipRgn.get() )
             m_contextSynthesized = true;
 #if wxOSX_USE_COCOA_OR_CARBON
             if ( m_clipRgn.get() )