From 2c489cc41023a40648dfde988d11b8ec2b66c7d0 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 23 Nov 2016 16:17:20 -0800 Subject: Merge IFWL and CFWL classes. This CL merges the IFWL hierarchy into the CFWL hierachy. All CFWL proxy methods have been replaced by the IFWL implementations. Review-Url: https://codereview.chromium.org/2524173002 --- xfa/fwl/core/cfwl_scrollbar.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/core/cfwl_scrollbar.cpp') diff --git a/xfa/fwl/core/cfwl_scrollbar.cpp b/xfa/fwl/core/cfwl_scrollbar.cpp index 85ab271258..6647350ef2 100644 --- a/xfa/fwl/core/cfwl_scrollbar.cpp +++ b/xfa/fwl/core/cfwl_scrollbar.cpp @@ -25,8 +25,8 @@ CFWL_ScrollBar::CFWL_ScrollBar( const CFWL_App* app, std::unique_ptr properties, - IFWL_Widget* pOuter) - : IFWL_Widget(app, std::move(properties), pOuter), + CFWL_Widget* pOuter) + : CFWL_Widget(app, std::move(properties), pOuter), m_pTimerInfo(nullptr), m_fRangeMin(0), m_fRangeMax(-1), @@ -77,7 +77,7 @@ void CFWL_ScrollBar::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) { rect.Set(0, 0, (*pfMinWidth), (*pfMinWidth) * 3); else rect.Set(0, 0, (*pfMinWidth) * 3, (*pfMinWidth)); - IFWL_Widget::GetWidgetRect(rect, true); + CFWL_Widget::GetWidgetRect(rect, true); } void CFWL_ScrollBar::Update() { -- cgit v1.2.3