Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.

xfa/fwl/core/ifwl_monthcalendar.h

 // 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
 
 #ifndef XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
 #define XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_
 
 #include "xfa/fgas/localization/fgas_datetime.h"
 #include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_dataprovider.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
 #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0)
 #define FWL_STYLEEXT_MCD_NoToday (1L << 1)
 #define FWL_STYLEEXT_MCD_NoTodayCircle (1L << 2)
 #define FWL_STYLEEXT_MCD_WeekNumbers (1L << 3)
 #define FWL_ITEMSTATE_MCD_Nomal (0L << 0)
 #define FWL_ITEMSTATE_MCD_Flag (1L << 0)
 #define FWL_ITEMSTATE_MCD_Selected (1L << 1)
 #define FWL_ITEMSTATE_MCD_Focused (1L << 2)
 
 FWL_EVENT_DEF(CFWL_Event_McdDateSelected,
               CFWL_EventType::DataSelected,
               int32_t m_iStartDay;
               int32_t m_iEndDay;)
 
 FWL_EVENT_DEF(CFWL_EventMcdDateChanged,
               CFWL_EventType::DateChanged,
               int32_t m_iOldYear;
               int32_t m_iOldMonth;
               int32_t m_iStartDay;
               int32_t m_iEndDay;)
 
 class CFWL_MsgMouse;
-class CFWL_WidgetImpProperties;
+class CFWL_WidgetProperties;

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

nit: do we need this given the include at 12

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

Done.

 class IFWL_Widget;
 
 struct FWL_DATEINFO;
 
 extern uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth);
 
 class IFWL_MonthCalendarDP : public IFWL_DataProvider {
  public:
   virtual int32_t GetCurDay(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurMonth(IFWL_Widget* pWidget) = 0;
   virtual int32_t GetCurYear(IFWL_Widget* pWidget) = 0;
 };
 
 class IFWL_MonthCalendar : public IFWL_Widget {
  public:
   IFWL_MonthCalendar(const IFWL_App* app,
-                     const CFWL_WidgetImpProperties& properties,
+                     std::unique_ptr<CFWL_WidgetProperties> properties,
                      IFWL_Widget* pOuter);
   ~IFWL_MonthCalendar() override;
 
   // FWL_WidgetImp
   FWL_Type GetClassID() const override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false) override;
   FWL_Error Update() override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
   void OnProcessMessage(CFWL_Message* pMessage) override;
@@ skipping 191 matching lines @@
   ~FWL_DATEINFO();
 
   int32_t iDay;
   int32_t iDayOfWeek;
   uint32_t dwStates;
   CFX_RectF rect;
   CFX_WideString wsDay;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_MONTHCALENDAR_H_