Fold IFWL*::{Initialize|Finalize} into constructor/destructor

xfa/fwl/core/ifwl_datetimepicker.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/core/ifwl_datetimepicker.h"
 
+#include "third_party/base/ptr_util.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_datetimecalendar.h"
 #include "xfa/fwl/core/ifwl_datetimeedit.h"
 #include "xfa/fwl/core/ifwl_formproxy.h"
 #include "xfa/fwl/core/ifwl_spinbutton.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 namespace {
 
 const int kDateTimePickerWidth = 100;
 const int kDateTimePickerHeight = 20;
 
 }  // namespace
 
 IFWL_DateTimePicker::IFWL_DateTimePicker(
     const IFWL_App* app,
     const CFWL_WidgetImpProperties& properties)
     : IFWL_Widget(app, properties, nullptr),
       m_iBtnState(1),
       m_iYear(-1),
       m_iMonth(-1),
       m_iDay(-1),
       m_bLBtnDown(FALSE) {
   m_rtBtn.Set(0, 0, 0, 0);
-}
 
-IFWL_DateTimePicker::~IFWL_DateTimePicker() {}
-
-void IFWL_DateTimePicker::Initialize() {
-  IFWL_Widget::Initialize();
-
-  m_pDelegate = new CFWL_DateTimePickerImpDelegate(this);
+  SetDelegate(pdfium::MakeUnique<CFWL_DateTimePickerImpDelegate>(this));
 
   m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
   CFWL_WidgetImpProperties propMonth;
   propMonth.m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
   propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
   propMonth.m_pDataProvider = &m_MonthCalendarDP;
   propMonth.m_pParent = this;
   propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pMonthCal.reset(new IFWL_DateTimeCalendar(m_pOwnerApp, propMonth, this));
-  m_pMonthCal->Initialize();
   CFX_RectF rtMonthCal;
   m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
   rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtMonthCal);
   CFWL_WidgetImpProperties propEdit;
   propEdit.m_pParent = this;
   propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, propEdit, this));
-  m_pEdit->Initialize();
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
 }
 
-void IFWL_DateTimePicker::Finalize() {
-  if (m_pEdit)
-    m_pEdit->Finalize();
-  if (m_pMonthCal)
-    m_pMonthCal->Finalize();
-  if (m_pForm)
-    m_pForm->Finalize();
-
+IFWL_DateTimePicker::~IFWL_DateTimePicker() {
   UnregisterEventTarget();
-  delete m_pDelegate;
-  m_pDelegate = nullptr;
-  IFWL_Widget::Finalize();
 }
 
 FWL_Type IFWL_DateTimePicker::GetClassID() const {
   return FWL_Type::DateTimePicker;
 }
 
 FWL_Error IFWL_DateTimePicker::GetWidgetRect(CFX_RectF& rect,
                                              FX_BOOL bAutoSize) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_GetWidgetRect(rect, bAutoSize);
@@ skipping 226 matching lines @@
 FWL_Error IFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
                                                   uint32_t dwStylesExRemoved) {
   return m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
 
 void IFWL_DateTimePicker::DrawDropDownButton(CFX_Graphics* pGraphics,
                                              IFWL_ThemeProvider* pTheme,
                                              const CFX_Matrix* pMatrix) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_Spin) ==
       FWL_STYLEEXT_DTP_Spin) {
-    CFWL_WidgetImpProperties prop;
-    prop.m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert;
-    prop.m_pParent = this;
-    prop.m_rtWidget = m_rtBtn;
-    IFWL_SpinButton* pSpin = new IFWL_SpinButton(m_pOwnerApp, prop);
-    pSpin->Initialize();

[dsinclair, 2016/10/31 19:48:18]

This never did anything with pSpin so it would just leak. Removed the creation
which means all this block goes away.

-  } else {
-    CFWL_ThemeBackground param;
-    param.m_pWidget = this;
-    param.m_iPart = CFWL_Part::DropDownButton;
-    param.m_dwStates = m_iBtnState;
-    param.m_pGraphics = pGraphics;
-    param.m_rtPart = m_rtBtn;
-    if (pMatrix) {
-      param.m_matrix.Concat(*pMatrix);
-    }
-    pTheme->DrawBackground(&param);
+    return;
   }
+
+  CFWL_ThemeBackground param;
+  param.m_pWidget = this;
+  param.m_iPart = CFWL_Part::DropDownButton;
+  param.m_dwStates = m_iBtnState;
+  param.m_pGraphics = pGraphics;
+  param.m_rtPart = m_rtBtn;
+  if (pMatrix)
+    param.m_matrix.Concat(*pMatrix);
+
+  pTheme->DrawBackground(&param);
 }
 
 void IFWL_DateTimePicker::FormatDateString(int32_t iYear,
                                            int32_t iMonth,
                                            int32_t iDay,
                                            CFX_WideString& wsText) {
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat) ==
       FWL_STYLEEXT_DTP_ShortDateFormat) {
     wsText.Format(L"%d-%d-%d", iYear, iMonth, iDay);
   } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_DTP_LongDateFormat) ==
@@ skipping 102 matching lines @@
   if (m_pForm)
     return;
   if (!m_pMonthCal)
     return;
   CFWL_WidgetImpProperties propForm;
   propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
   propForm.m_dwStates = FWL_WGTSTATE_Invisible;
   propForm.m_pOwner = this;
 
   m_pForm.reset(new IFWL_FormProxy(m_pOwnerApp, propForm, m_pMonthCal.get()));
-  m_pForm->Initialize();
   m_pMonthCal->SetParent(m_pForm.get());
 }
 
 IFWL_DateTimeEdit* IFWL_DateTimePicker::GetDataTimeEdit() {
   return m_pEdit.get();
 }
 
 FWL_Error IFWL_DateTimePicker::DisForm_Initialize() {
   m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat;
   DisForm_InitDateTimeCalendar();
   DisForm_InitDateTimeEdit();
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
   return FWL_Error::Succeeded;
 }
 
 void IFWL_DateTimePicker::DisForm_InitDateTimeCalendar() {
   if (m_pMonthCal) {
     return;
   }
   CFWL_WidgetImpProperties propMonth;
   propMonth.m_dwStyles =
       FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border | FWL_WGTSTYLE_EdgeSunken;
   propMonth.m_dwStates = FWL_WGTSTATE_Invisible;
   propMonth.m_pParent = this;
   propMonth.m_pDataProvider = &m_MonthCalendarDP;
   propMonth.m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pMonthCal.reset(new IFWL_DateTimeCalendar(m_pOwnerApp, propMonth, this));
-  m_pMonthCal->Initialize();
   CFX_RectF rtMonthCal;
   m_pMonthCal->GetWidgetRect(rtMonthCal, TRUE);
   rtMonthCal.Set(0, 0, rtMonthCal.width, rtMonthCal.height);
   m_pMonthCal->SetWidgetRect(rtMonthCal);
 }
 
 void IFWL_DateTimePicker::DisForm_InitDateTimeEdit() {
   if (m_pEdit) {
     return;
   }
   CFWL_WidgetImpProperties propEdit;
   propEdit.m_pParent = this;
   propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
   m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, propEdit, this));
-  m_pEdit->Initialize();
 }
 
 FX_BOOL IFWL_DateTimePicker::DisForm_IsMonthCalendarShowed() {
   if (!m_pMonthCal)
     return FALSE;
   return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible);
 }
 
 void IFWL_DateTimePicker::DisForm_ShowMonthCalendar(FX_BOOL bActivate) {
   FX_BOOL bShowed = IsMonthCalendarShowed();
@@ skipping 325 matching lines @@
 
 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurMonth(
     IFWL_Widget* pWidget) {
   return m_iCurMonth;
 }
 
 int32_t IFWL_DateTimePicker::CFWL_MonthCalendarImpDP::GetCurYear(
     IFWL_Widget* pWidget) {
   return m_iCurYear;
 }