Index: xfa/fwl/theme/cfwl_monthcalendartp.cpp |
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp |
index 7faa8e1533737b69353fa30e0d2728cf281bf1f2..eee199ee6dea7c9adf75c9a160e2139d1ac1bbcc 100644 |
--- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp |
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp |
@@ -461,6 +461,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawHSeperator(CFWL_ThemeBackground* pParams, |
pParams->m_pGraphics->RestoreGraphState(); |
return TRUE; |
} |
+ |
FX_BOOL CFWL_MonthCalendarTP::DrawWeekNumSep(CFWL_ThemeBackground* pParams, |
CFX_Matrix* pMatrix) { |
CFX_Path path; |
@@ -476,6 +477,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawWeekNumSep(CFWL_ThemeBackground* pParams, |
pParams->m_pGraphics->RestoreGraphState(); |
return TRUE; |
} |
+ |
FX_BOOL CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, |
CFX_Matrix* pMatrix) { |
pParams->m_pGraphics->SaveGraphState(); |
@@ -486,8 +488,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, |
rtSelDay = pParams->m_rtPart; |
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, |
rtSelDay.height); |
- CFX_Color clrSelDayBK; |
- clrSelDayBK = m_pThemeData->clrDatesSelectedBK; |
+ CFX_Color clrSelDayBK(m_pThemeData->clrDatesSelectedBK); |
pParams->m_pGraphics->SetFillColor(&clrSelDayBK); |
pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); |
} else if (pParams->m_dwStates & CFWL_PartState_Hovered) { |
@@ -497,14 +498,14 @@ FX_BOOL CFWL_MonthCalendarTP::DrawDatesInBK(CFWL_ThemeBackground* pParams, |
rtSelDay = pParams->m_rtPart; |
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, |
rtSelDay.height); |
- CFX_Color clrSelDayBK; |
- clrSelDayBK = m_pThemeData->clrDatesHoverBK; |
+ CFX_Color clrSelDayBK(m_pThemeData->clrDatesHoverBK); |
pParams->m_pGraphics->SetFillColor(&clrSelDayBK); |
pParams->m_pGraphics->FillPath(&path, FXFILL_WINDING, pMatrix); |
} |
pParams->m_pGraphics->RestoreGraphState(); |
return FALSE; |
} |
+ |
FX_BOOL CFWL_MonthCalendarTP::DrawDatesInCircle(CFWL_ThemeBackground* pParams, |
CFX_Matrix* pMatrix) { |
CFX_Path path; |
@@ -514,13 +515,13 @@ FX_BOOL CFWL_MonthCalendarTP::DrawDatesInCircle(CFWL_ThemeBackground* pParams, |
path.AddRectangle(rtSelDay.left, rtSelDay.top, rtSelDay.width, |
rtSelDay.height); |
pParams->m_pGraphics->SaveGraphState(); |
- CFX_Color clrSelDayBK; |
- clrSelDayBK = m_pThemeData->clrDatesCircle; |
+ CFX_Color clrSelDayBK(m_pThemeData->clrDatesCircle); |
pParams->m_pGraphics->SetStrokeColor(&clrSelDayBK); |
pParams->m_pGraphics->StrokePath(&path, pMatrix); |
pParams->m_pGraphics->RestoreGraphState(); |
return TRUE; |
} |
+ |
FX_BOOL CFWL_MonthCalendarTP::DrawTodayCircle(CFWL_ThemeBackground* pParams, |
CFX_Matrix* pMatrix) { |
CFX_Path path; |
@@ -530,8 +531,7 @@ FX_BOOL CFWL_MonthCalendarTP::DrawTodayCircle(CFWL_ThemeBackground* pParams, |
path.AddRectangle(rtTodayCircle.left, rtTodayCircle.top, rtTodayCircle.width, |
rtTodayCircle.height); |
pParams->m_pGraphics->SaveGraphState(); |
- CFX_Color clrTodayCircle; |
- clrTodayCircle = m_pThemeData->clrDatesCircle; |
+ CFX_Color clrTodayCircle(m_pThemeData->clrDatesCircle); |
pParams->m_pGraphics->SetStrokeColor(&clrTodayCircle); |
pParams->m_pGraphics->StrokePath(&path, pMatrix); |
pParams->m_pGraphics->RestoreGraphState(); |