diff options
Diffstat (limited to 'xfa/fxfa')
| -rw-r--r-- | xfa/fxfa/cxfa_ffpushbutton.cpp | 2 | ||||
| -rw-r--r-- | xfa/fxfa/cxfa_fwltheme.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp index 91b6f3ff27..b6ba0f56b1 100644 --- a/xfa/fxfa/cxfa_ffpushbutton.cpp +++ b/xfa/fxfa/cxfa_ffpushbutton.cpp @@ -215,7 +215,7 @@ void CXFA_FFPushButton::OnDrawWidget(CXFA_Graphics* pGraphics, CXFA_Path path; path.AddRectangle(rtFill.left, rtFill.top, rtFill.width, rtFill.height); pGraphics->SetFillColor(CXFA_Color(FXARGB_MAKE(128, 128, 255, 255))); - pGraphics->FillPath(&path, FXFILL_WINDING, (CFX_Matrix*)pMatrix); + pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); } return; } diff --git a/xfa/fxfa/cxfa_fwltheme.cpp b/xfa/fxfa/cxfa_fwltheme.cpp index 85e48a5123..67258c1868 100644 --- a/xfa/fxfa/cxfa_fwltheme.cpp +++ b/xfa/fxfa/cxfa_fwltheme.cpp @@ -111,10 +111,10 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) { return; CFX_Matrix mtPart = pParams->m_matrix; - CFX_Matrix* pMatrix = pGraphics->GetMatrix(); - if (pMatrix) { + const CFX_Matrix* pMatrix = pGraphics->GetMatrix(); + if (pMatrix) mtPart.Concat(*pMatrix); - } + m_pTextOut->SetMatrix(mtPart); m_pTextOut->DrawLogicText(pRenderDevice, pParams->m_wsText.c_str(), pParams->m_wsText.GetLength(), pParams->m_rtPart); @@ -136,7 +136,7 @@ void CXFA_FWLTheme::DrawText(CFWL_ThemeText* pParams) { m_pTextOut->SetFontSize(pAcc->GetFontSize()); m_pTextOut->SetTextColor(pAcc->GetTextColor()); CFX_Matrix mtPart = pParams->m_matrix; - CFX_Matrix* pMatrix = pGraphics->GetMatrix(); + const CFX_Matrix* pMatrix = pGraphics->GetMatrix(); if (pMatrix) mtPart.Concat(*pMatrix); |