From 98329fe75b9c3e5422344a37d787fb22c89c2ca2 Mon Sep 17 00:00:00 2001
From: dsinclair <dsinclair@chromium.org>
Date: Thu, 10 Nov 2016 09:40:14 -0800
Subject: Cleanup IFWL_Widget visibility and virtual parameters

This Cl cleans up the IFWL_Widget class including:

 * Making members and methods private where possible
 * Removing virtual methods that are never overridden
 * Removing methods that do nothing
 * Removing unchecked FWL_Error return codes

Review-Url: https://codereview.chromium.org/2488953003
---
 xfa/fwl/core/ifwl_monthcalendar.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'xfa/fwl/core/ifwl_monthcalendar.cpp')

diff --git a/xfa/fwl/core/ifwl_monthcalendar.cpp b/xfa/fwl/core/ifwl_monthcalendar.cpp
index 28d529787d..7351e7e29a 100644
--- a/xfa/fwl/core/ifwl_monthcalendar.cpp
+++ b/xfa/fwl/core/ifwl_monthcalendar.cpp
@@ -157,7 +157,7 @@ FWL_Type IFWL_MonthCalendar::GetClassID() const {
   return FWL_Type::MonthCalendar;
 }
 
-FWL_Error IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
+void IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   if (bAutoSize) {
     CFX_SizeF fs = CalcSize(true);
     rect.Set(0, 0, fs.x, fs.y);
@@ -165,12 +165,11 @@ FWL_Error IFWL_MonthCalendar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
   } else {
     rect = m_pProperties->m_rtWidget;
   }
-  return FWL_Error::Succeeded;
 }
 
-FWL_Error IFWL_MonthCalendar::Update() {
+void IFWL_MonthCalendar::Update() {
   if (IsLocked()) {
-    return FWL_Error::Indefinite;
+    return;
   }
   if (!m_pProperties->m_pThemeProvider) {
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
@@ -182,13 +181,12 @@ FWL_Error IFWL_MonthCalendar::Update() {
   ClearDateItem();
   ReSetDateItem();
   LayOut();
-  return FWL_Error::Succeeded;
 }
 
-FWL_Error IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
-                                         const CFX_Matrix* pMatrix) {
+void IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
+                                    const CFX_Matrix* pMatrix) {
   if (!pGraphics)
-    return FWL_Error::Indefinite;
+    return;
   if (!m_pProperties->m_pThemeProvider) {
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
   }
@@ -215,7 +213,6 @@ FWL_Error IFWL_MonthCalendar::DrawWidget(CFX_Graphics* pGraphics,
     DrawWeekNumberSep(pGraphics, pTheme, pMatrix);
     DrawWeekNumber(pGraphics, pTheme, pMatrix);
   }
-  return FWL_Error::Succeeded;
 }
 
 int32_t IFWL_MonthCalendar::CountSelect() {
-- 
cgit v1.2.3