From 98329fe75b9c3e5422344a37d787fb22c89c2ca2 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 09:40:14 -0800 Subject: Cleanup IFWL_Widget visibility and virtual parameters This Cl cleans up the IFWL_Widget class including: * Making members and methods private where possible * Removing virtual methods that are never overridden * Removing methods that do nothing * Removing unchecked FWL_Error return codes Review-Url: https://codereview.chromium.org/2488953003 --- xfa/fwl/core/cfwl_widget.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'xfa/fwl/core/cfwl_widget.h') diff --git a/xfa/fwl/core/cfwl_widget.h b/xfa/fwl/core/cfwl_widget.h index b3c09f9738..d41de2694d 100644 --- a/xfa/fwl/core/cfwl_widget.h +++ b/xfa/fwl/core/cfwl_widget.h @@ -26,15 +26,14 @@ class CFWL_Widget { IFWL_Widget* GetWidget(); const IFWL_Widget* GetWidget() const; - FWL_Error GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false); - FWL_Error SetWidgetRect(const CFX_RectF& rect); - FWL_Error GetGlobalRect(CFX_RectF& rect); - FWL_Error GetClientRect(CFX_RectF& rtClient); + void GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false); + void SetWidgetRect(const CFX_RectF& rect); + void GetGlobalRect(CFX_RectF& rect); + void GetClientRect(CFX_RectF& rtClient); - FWL_Error ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); + void ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); uint32_t GetStylesEx(); - FWL_Error ModifyStylesEx(uint32_t dwStylesExAdded, - uint32_t dwStylesExRemoved); + void ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); uint32_t GetStates(); void SetStates(uint32_t dwStates, bool bSet = true); @@ -47,8 +46,7 @@ class CFWL_Widget { FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); - FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = nullptr); + void DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr); IFWL_WidgetDelegate* GetDelegate() const; void SetDelegate(IFWL_WidgetDelegate*); -- cgit v1.2.3