Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.

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),
+    std::unique_ptr<CFWL_WidgetProperties> properties)
+    : IFWL_Widget(app, std::move(properties), nullptr),
       m_iBtnState(1),
       m_iYear(-1),
       m_iMonth(-1),
       m_iDay(-1),
       m_bLBtnDown(false) {
   m_rtBtn.Set(0, 0, 0, 0);
 
   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));
+  auto propMonth =

[Tom Sepez, 2016/11/03 18:22:44]

nit: same, monthProp.

[dsinclair, 2016/11/03 19:10:18]

Done.

+      pdfium::MakeUnique<CFWL_WidgetProperties>(&m_MonthCalendarDP);
+  propMonth->m_dwStyles = FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border;
+  propMonth->m_dwStates = FWL_WGTSTATE_Invisible;
+  propMonth->m_pParent = this;
+  propMonth->m_pThemeProvider = m_pProperties->m_pThemeProvider;
+  m_pMonthCal.reset(
+      new IFWL_DateTimeCalendar(m_pOwnerApp, std::move(propMonth), this));
+
   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));
+  auto propEdit = pdfium::MakeUnique<CFWL_WidgetProperties>();
+  propEdit->m_pParent = this;
+  propEdit->m_pThemeProvider = m_pProperties->m_pThemeProvider;
+
+  m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, std::move(propEdit), this));
   RegisterEventTarget(m_pMonthCal.get());
   RegisterEventTarget(m_pEdit.get());
 }
 
 IFWL_DateTimePicker::~IFWL_DateTimePicker() {
   UnregisterEventTarget();
 }
 
 FWL_Type IFWL_DateTimePicker::GetClassID() const {
   return FWL_Type::DateTimePicker;
@@ skipping 360 matching lines @@
   ev.iMonth = m_iMonth;
   ev.iDay = m_iDay;
   DispatchEvent(&ev);
 }
 
 void IFWL_DateTimePicker::InitProxyForm() {
   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()));
+  auto propForm = pdfium::MakeUnique<CFWL_WidgetProperties>();

[Tom Sepez, 2016/11/03 18:22:44]

ditto and below.

[dsinclair, 2016/11/03 19:10:18]

Done.

+  propForm->m_dwStyles = FWL_WGTSTYLE_Popup;
+  propForm->m_dwStates = FWL_WGTSTATE_Invisible;
+  propForm->m_pOwner = this;
+
+  m_pForm.reset(
+      new IFWL_FormProxy(m_pOwnerApp, std::move(propForm), m_pMonthCal.get()));
   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) {

[Tom Sepez, 2016/11/03 18:22:44]

nit: no {} while were at it.

[dsinclair, 2016/11/03 19:10:18]

Done.

     return;
   }
-  CFWL_WidgetImpProperties propMonth;
-  propMonth.m_dwStyles =
+  auto propMonth =
+      pdfium::MakeUnique<CFWL_WidgetProperties>(&m_MonthCalendarDP);
+  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;
+  propMonth->m_dwStates = FWL_WGTSTATE_Invisible;
+  propMonth->m_pParent = this;
+  propMonth->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
-  m_pMonthCal.reset(new IFWL_DateTimeCalendar(m_pOwnerApp, propMonth, this));
+  m_pMonthCal.reset(
+      new IFWL_DateTimeCalendar(m_pOwnerApp, std::move(propMonth), this));
   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) {

[Tom Sepez, 2016/11/03 18:22:44]

nit: no {}

[dsinclair, 2016/11/03 19:10:17]

Done.

     return;
   }
-  CFWL_WidgetImpProperties propEdit;
-  propEdit.m_pParent = this;
-  propEdit.m_pThemeProvider = m_pProperties->m_pThemeProvider;
+  auto propEdit = pdfium::MakeUnique<CFWL_WidgetProperties>();
+  propEdit->m_pParent = this;
+  propEdit->m_pThemeProvider = m_pProperties->m_pThemeProvider;
 
-  m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, propEdit, this));
+  m_pEdit.reset(new IFWL_DateTimeEdit(m_pOwnerApp, std::move(propEdit), this));
 }
 
 bool IFWL_DateTimePicker::DisForm_IsMonthCalendarShowed() {
   if (!m_pMonthCal)
     return false;
   return !(m_pMonthCal->GetStates() & FWL_WGTSTATE_Invisible);
 }
 
 void IFWL_DateTimePicker::DisForm_ShowMonthCalendar(bool bActivate) {
   bool bShowed = IsMonthCalendarShowed();
@@ skipping 306 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;
 }