From 37b6d1479b1674eb239cea8893eea31274d22ecd Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 21 Nov 2016 17:05:58 -0800 Subject: Split fwl/core class pt II. Split classes in FWL to be single class per file. In the case of data providers which added no new methods, removed and used the IFWL_Widget::DataProvider directly. Review-Url: https://codereview.chromium.org/2520063002 --- xfa/fwl/core/ifwl_checkbox.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl/core/ifwl_checkbox.cpp') diff --git a/xfa/fwl/core/ifwl_checkbox.cpp b/xfa/fwl/core/ifwl_checkbox.cpp index 0d18e2cec5..04f367f772 100644 --- a/xfa/fwl/core/ifwl_checkbox.cpp +++ b/xfa/fwl/core/ifwl_checkbox.cpp @@ -15,10 +15,10 @@ #include "xfa/fwl/core/cfwl_evtcheckstatechanged.h" #include "xfa/fwl/core/cfwl_msgkey.h" #include "xfa/fwl/core/cfwl_msgmouse.h" +#include "xfa/fwl/core/cfwl_notedriver.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themetext.h" #include "xfa/fwl/core/cfwl_widgetmgr.h" -#include "xfa/fwl/core/fwl_noteimp.h" #include "xfa/fwl/core/ifwl_app.h" #include "xfa/fwl/core/ifwl_themeprovider.h" @@ -70,8 +70,8 @@ void IFWL_CheckBox::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) { } rect.Inflate(kCaptionMargin, kCaptionMargin); - IFWL_CheckBoxDP* pData = - static_cast(m_pProperties->m_pDataProvider); + IFWL_CheckBox::DataProvider* pData = + static_cast(m_pProperties->m_pDataProvider); FX_FLOAT fCheckBox = pData->GetBoxSize(this); rect.width += fCheckBox; rect.height = std::max(rect.height, fCheckBox); @@ -172,8 +172,8 @@ void IFWL_CheckBox::Layout() { FX_FLOAT fBoxTop = m_rtClient.top; FX_FLOAT fClientBottom = m_rtClient.bottom(); - IFWL_CheckBoxDP* pData = - static_cast(m_pProperties->m_pDataProvider); + IFWL_CheckBox::DataProvider* pData = + static_cast(m_pProperties->m_pDataProvider); FX_FLOAT fCheckBox = pData->GetBoxSize(this); switch (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CKB_VLayoutMask) { case FWL_STYLEEXT_CKB_Top: -- cgit v1.2.3