From 935d8d5dcbf1da2b3198675428cbf7ca0406788f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 17 May 2016 10:32:18 -0700 Subject: XFA_WIDGETSTATUS cleanup. This CL moves all of the XFA_WIDGETSTATUS values into a single enum instead of multiple defines. The values are also normalized. The name was updated to be XFA_WidgetStatus. The XFA_WIDGETFILTER and XFA_LAYOUTSTATUS defines had to match up to XFA_WIDGETSTATUS. This Cl replaces those so we just have a single enum to work with. Review-Url: https://codereview.chromium.org/1986503002 --- xfa/fxfa/app/xfa_ffwidgethandler.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xfa/fxfa/app/xfa_ffwidgethandler.cpp') diff --git a/xfa/fxfa/app/xfa_ffwidgethandler.cpp b/xfa/fxfa/app/xfa_ffwidgethandler.cpp index 13cee333a5..027c3d9fa8 100644 --- a/xfa/fxfa/app/xfa_ffwidgethandler.cpp +++ b/xfa/fxfa/app/xfa_ffwidgethandler.cpp @@ -163,7 +163,7 @@ FX_BOOL CXFA_FFWidgetHandler::OnChar(CXFA_FFWidget* hWidget, FWL_WidgetHit CXFA_FFWidgetHandler::OnHitTest(CXFA_FFWidget* hWidget, FX_FLOAT fx, FX_FLOAT fy) { - if (!(hWidget->GetStatus() & XFA_WIDGETSTATUS_Visible)) + if (!(hWidget->GetStatus() & XFA_WidgetStatus_Visible)) return FWL_WidgetHit::Unknown; hWidget->Rotate2Normal(fx, fy); @@ -182,7 +182,7 @@ void CXFA_FFWidgetHandler::RenderWidget(CXFA_FFWidget* hWidget, CFX_Matrix* pMatrix, FX_BOOL bHighlight) { hWidget->RenderWidget(pGS, pMatrix, - bHighlight ? XFA_WIDGETSTATUS_Highlight : 0, 0); + bHighlight ? XFA_WidgetStatus_Highlight : 0, 0); } FX_BOOL CXFA_FFWidgetHandler::HasEvent(CXFA_WidgetAcc* pWidgetAcc, -- cgit v1.2.3