apply complete transforms (scroll window PrepareDC was not functioning properly)

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

diff --git a/src/common/dcgraph.cpp b/src/common/dcgraph.cpp
index c9889d2d399e8b05c42cba8e18682940b7a1ce4a..de8f07b3fb5f83a462cd87010f7fc1514930f37a 100644 (file)
--- a/src/common/dcgraph.cpp
+++ b/src/common/dcgraph.cpp
@@ -291,12 +291,11 @@ void wxGCDC::ComputeScaleAndOrigin()
 {
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 {
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;

-    m_deviceOriginX = /* m_deviceOriginX + */ m_logicalOriginX;
-    m_deviceOriginY = /* m_deviceOriginY + */ m_logicalOriginY;

 
     m_matrixCurrent = m_graphicContext->CreateMatrix();
 
     m_matrixCurrent = m_graphicContext->CreateMatrix();

-    m_matrixCurrent.Translate( m_deviceOriginX , m_deviceOriginY );
+    m_matrixCurrent.Translate( m_deviceOriginX, m_deviceOriginY );

     m_matrixCurrent.Scale( m_scaleX, m_scaleY );
     m_matrixCurrent.Scale( m_scaleX, m_scaleY );

+    m_matrixCurrent.Translate( m_logicalOriginX, m_logicalOriginY );

     
     m_graphicContext->SetTransform( m_matrixOriginal );
     m_graphicContext->ConcatTransform( m_matrixCurrent );
     
     m_graphicContext->SetTransform( m_matrixOriginal );
     m_graphicContext->ConcatTransform( m_matrixCurrent );