From d92477068ad0918c97a5dab799d8cfdf07ce3580 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 15 Dec 2016 13:43:29 -0800 Subject: Remove more unused widget styles Remove more FWL Widget Styles which are never set. Review-Url: https://codereview.chromium.org/2578473003 --- xfa/fwl/cfwl_edit.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xfa/fwl/cfwl_edit.cpp') diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp index f51249eaca..ecf012e0a0 100644 --- a/xfa/fwl/cfwl_edit.cpp +++ b/xfa/fwl/cfwl_edit.cpp @@ -662,8 +662,7 @@ void CFWL_Edit::UpdateEditParams() { } if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) { params.dwMode |= FDE_TEXTEDITMODE_MultiLines; - if ((m_pProperties->m_dwStyles & FWL_WGTSTYLE_HScroll) == 0 && - (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_AutoHScroll) == 0) { + if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_AutoHScroll) == 0) { params.dwMode |= FDE_TEXTEDITMODE_AutoLineWrap | FDE_TEXTEDITMODE_LimitArea_Horz; } @@ -925,8 +924,7 @@ bool CFWL_Edit::IsShowScrollBar(bool bVert) { (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) && IsContentHeightOverflow(); } - return bShow && (m_pProperties->m_dwStyles & FWL_WGTSTYLE_HScroll) && - (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine); + return false; } bool CFWL_Edit::IsContentHeightOverflow() { -- cgit v1.2.3