Cleanup CFWL_Widget code to return CFX_RectFs where appropriate

xfa/fwl/cfwl_monthcalendar.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/cfwl_monthcalendar.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 583 matching lines @@
       m_rtDates.bottom() + MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN,
       m_szCell.x, m_szToday.y);
   m_rtToday.Set(
       m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN + m_szCell.x +
           MONTHCAL_HMARGIN * 2,
       m_rtDates.bottom() + MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN,
       m_szToday.x, m_szToday.y);
 }
 
 void CFWL_MonthCalendar::Layout() {
-  GetClientRect(m_rtClient);
+  m_rtClient = GetClientRect();
 
   m_rtHead.Set(
       m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN, m_rtClient.top,
       m_rtClient.width - MONTHCAL_HEADER_BTN_HMARGIN * 2,
       m_szCell.x + (MONTHCAL_HEADER_BTN_VMARGIN + MONTHCAL_VMARGIN) * 2);
   m_rtWeek.Set(m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN, m_rtHead.bottom(),
                m_rtClient.width - MONTHCAL_HEADER_BTN_HMARGIN * 2,
                m_szCell.y + MONTHCAL_VMARGIN * 2);
   m_rtLBtn.Set(m_rtClient.left + MONTHCAL_HEADER_BTN_HMARGIN,
                m_rtClient.top + MONTHCAL_HEADER_BTN_VMARGIN, m_szCell.x,
@@ skipping 312 matching lines @@
 
 void CFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics,
                                       const CFX_Matrix* pMatrix) {
   DrawWidget(pGraphics, pMatrix);
 }
 
 void CFWL_MonthCalendar::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = CFWL_PartState_Pressed;
     PrevMonth();
-    Repaint(&m_rtClient);
+    RepaintRect(m_rtClient);
   } else if (m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iRBtnPartStates |= CFWL_PartState_Pressed;
     NextMonth();
-    Repaint(&m_rtClient);
+    RepaintRect(m_rtClient);
   } else if (m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy)) {
     if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_NoToday) == 0) {
       JumpToToday();
-      Repaint(&m_rtClient);
+      RepaintRect(m_rtClient);
     }
   } else {
     CFWL_DateTimePicker* pIPicker = static_cast<CFWL_DateTimePicker*>(m_pOuter);
     if (pIPicker->IsMonthCalendarVisible())
       m_bFlag = 1;
   }
 }
 
 void CFWL_MonthCalendar::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_OnLButtonUp(pMsg);
 
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = 0;
-    Repaint(&m_rtLBtn);
+    RepaintRect(m_rtLBtn);
     return;
   }
   if (m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iRBtnPartStates = 0;
-    Repaint(&m_rtRBtn);
+    RepaintRect(m_rtRBtn);
     return;
   }
   if (m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   int32_t iOldSel = 0;
   if (m_arrSelDays.GetSize() > 0)
     iOldSel = m_arrSelDays[0];
 
   int32_t iCurSel = GetDayAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ skipping 15 matching lines @@
     pIPicker->ShowMonthCalendar(false);
   } else if (m_bFlag && (!rt.Contains(pMsg->m_fx, pMsg->m_fy))) {
     pIPicker->ShowMonthCalendar(false);
   }
   m_bFlag = 0;
 }
 
 void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = 0;
-    Repaint(&(m_rtLBtn));
+    RepaintRect(m_rtLBtn);
     return;
   }
   if (m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iRBtnPartStates = 0;
-    Repaint(&(m_rtRBtn));
+    RepaintRect(m_rtRBtn);
     return;
   }
   if (m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
   int32_t iOldSel = 0;
   if (m_arrSelDays.GetSize() > 0)
     iOldSel = m_arrSelDays[0];
 
   int32_t iCurSel = GetDayAtPoint(pMsg->m_fx, pMsg->m_fy);
@@ skipping 36 matching lines @@
     }
     m_iHovered = iHover;
   } else {
     bRepaint = m_iHovered > 0;
     if (bRepaint)
       GetDayRect(m_iHovered, rtInvalidate);
 
     m_iHovered = -1;
   }
   if (bRepaint && !rtInvalidate.IsEmpty())
-    Repaint(&rtInvalidate);
+    RepaintRect(rtInvalidate);
 }
 
 void CFWL_MonthCalendar::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (m_iHovered <= 0)
     return;
 
   CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, 0, 0);
   GetDayRect(m_iHovered, rtInvalidate);
   m_iHovered = -1;
   if (!rtInvalidate.IsEmpty())
-    Repaint(&rtInvalidate);
+    RepaintRect(rtInvalidate);
 }
 
 CFWL_MonthCalendar::DATEINFO::DATEINFO(int32_t day,
                                        int32_t dayofweek,
                                        uint32_t dwSt,
                                        CFX_RectF rc,
                                        CFX_WideString& wsday)
     : iDay(day),
       iDayOfWeek(dayofweek),
       dwStates(dwSt),
       rect(rc),
       wsDay(wsday) {}
 
 CFWL_MonthCalendar::DATEINFO::~DATEINFO() {}