From 89fcde88f0c03da77d7fd83dece7726d66fd190e Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 3 May 2016 13:00:25 -0700 Subject: Remove FWL_WGTHITTEST_* defines in favour of enum class. This Cl updates the FWL_WGTHITTEST_ defines to an enum class and fixes up any code issues. Review-Url: https://codereview.chromium.org/1948583002 --- xfa/fwl/core/fwl_widgetimp.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'xfa/fwl/core/fwl_widgetimp.h') diff --git a/xfa/fwl/core/fwl_widgetimp.h b/xfa/fwl/core/fwl_widgetimp.h index 9381a4203d..3eddfa51c2 100644 --- a/xfa/fwl/core/fwl_widgetimp.h +++ b/xfa/fwl/core/fwl_widgetimp.h @@ -12,6 +12,7 @@ #include "xfa/fwl/core/cfwl_event.h" #include "xfa/fwl/core/cfwl_themepart.h" #include "xfa/fwl/core/ifwl_widgetdelegate.h" +#include "xfa/fwl/core/include/fwl_widgethit.h" #include "xfa/fwl/theme/cfwl_widgettp.h" class CFWL_AppImp; @@ -57,7 +58,7 @@ class CFWL_WidgetImp { virtual FWL_ERR Update(); virtual FWL_ERR LockUpdate(); virtual FWL_ERR UnlockUpdate(); - virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); + virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); virtual FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt); virtual FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); -- cgit v1.2.3