From a5811f0edbaa3be7807dd84b3d4d7876289cef8a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 3 Nov 2016 12:27:25 -0700 Subject: Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties. The CFWL_WidgetProperties class was just being used to create default CFWL_WidgetImpProperties classes. This CL updates the code to make it clear that we have unique_ptrs to the properties and changes CFWL_WidgetImpProperties to be named CFWL_WidgetProperties. Review-Url: https://codereview.chromium.org/2469893004 --- xfa/fwl/core/ifwl_picturebox.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/ifwl_picturebox.h') diff --git a/xfa/fwl/core/ifwl_picturebox.h b/xfa/fwl/core/ifwl_picturebox.h index edd8e7efa5..2eeacae3af 100644 --- a/xfa/fwl/core/ifwl_picturebox.h +++ b/xfa/fwl/core/ifwl_picturebox.h @@ -7,7 +7,7 @@ #ifndef XFA_FWL_CORE_IFWL_PICTUREBOX_H_ #define XFA_FWL_CORE_IFWL_PICTUREBOX_H_ -#include "xfa/fwl/core/cfwl_widgetimpproperties.h" +#include "xfa/fwl/core/cfwl_widgetproperties.h" #include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_dataprovider.h" #include "xfa/fwl/core/ifwl_widget.h" @@ -27,7 +27,6 @@ #define FWL_STYLEEXT_PTB_VAlignMask 3L << 2 #define FWL_STYLEEXT_PTB_StretchAlignMask 7L << 4 -class CFWL_WidgetImpProperties; class CFX_DIBitmap; class IFWL_Widget; @@ -44,7 +43,7 @@ class IFWL_PictureBoxDP : public IFWL_DataProvider { class IFWL_PictureBox : public IFWL_Widget { public: explicit IFWL_PictureBox(const IFWL_App* app, - const CFWL_WidgetImpProperties& properties); + std::unique_ptr properties); ~IFWL_PictureBox() override; // IFWL_Widget -- cgit v1.2.3