Unify CFWL_WidgetProperties and CFWL_WidgetImpProperties.

xfa/fwl/core/ifwl_scrollbar.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_SCROLLBAR_H_
 #define XFA_FWL_CORE_IFWL_SCROLLBAR_H_
 
 #include "core/fxcrt/fx_system.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_timer.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
-class CFWL_WidgetImpProperties;
+class CFWL_WidgetProperties;

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

Probably other places where this isn't needed that I missed.

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

Done.

 class IFWL_Widget;
 
 #define FWL_STYLEEXT_SCB_Horz (0L << 0)
 #define FWL_STYLEEXT_SCB_Vert (1L << 0)
 
 enum FWL_SCBCODE {
   FWL_SCBCODE_None = 1,
   FWL_SCBCODE_Min,
   FWL_SCBCODE_Max,
   FWL_SCBCODE_PageBackward,
   FWL_SCBCODE_PageForward,
   FWL_SCBCODE_StepBackward,
   FWL_SCBCODE_StepForward,
   FWL_SCBCODE_Pos,
   FWL_SCBCODE_TrackPos,
   FWL_SCBCODE_EndScroll,
 };
 
 class IFWL_ScrollBarDP : public IFWL_DataProvider {};
 
 class IFWL_ScrollBar : public IFWL_Widget {
  public:
   IFWL_ScrollBar(const IFWL_App* app,
-                 const CFWL_WidgetImpProperties& properties,
+                 std::unique_ptr<CFWL_WidgetProperties> properties,
                  IFWL_Widget* pOuter);
   ~IFWL_ScrollBar() override;
 
   // IFWL_Widget
   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 103 matching lines @@
   void DoMouseMove(int32_t iItem,
                    const CFX_RectF& rtItem,
                    int32_t& iState,
                    FX_FLOAT fx,
                    FX_FLOAT fy);
   void DoMouseLeave(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
   void DoMouseHover(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState);
 };
 
 #endif  // XFA_FWL_CORE_IFWL_SCROLLBAR_H_