Index: xfa/fwl/core/ifwl_widget.h |
diff --git a/xfa/fwl/core/ifwl_widget.h b/xfa/fwl/core/ifwl_widget.h |
index 62f7155c5d2050a046aa15d37b11d0ea851d152b..0743746c2388790be0815178479e54effe9f3722 100644 |
--- a/xfa/fwl/core/ifwl_widget.h |
+++ b/xfa/fwl/core/ifwl_widget.h |
@@ -39,48 +39,50 @@ class IFWL_Widget { |
IFWL_Widget() : m_pImpl(nullptr) {} |
virtual ~IFWL_Widget(); |
- FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); |
- FWL_ERR GetGlobalRect(CFX_RectF& rect); |
- FWL_ERR SetWidgetRect(const CFX_RectF& rect); |
- FWL_ERR GetClientRect(CFX_RectF& rect); |
+ FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); |
+ FWL_Error GetGlobalRect(CFX_RectF& rect); |
+ FWL_Error SetWidgetRect(const CFX_RectF& rect); |
+ FWL_Error GetClientRect(CFX_RectF& rect); |
IFWL_Widget* GetParent(); |
- FWL_ERR SetParent(IFWL_Widget* pParent); |
+ FWL_Error SetParent(IFWL_Widget* pParent); |
IFWL_Widget* GetOwner(); |
- FWL_ERR SetOwner(IFWL_Widget* pOwner); |
+ FWL_Error SetOwner(IFWL_Widget* pOwner); |
IFWL_Widget* GetOuter(); |
uint32_t GetStyles(); |
- FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); |
+ FWL_Error ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); |
uint32_t GetStylesEx(); |
- FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); |
+ FWL_Error ModifyStylesEx(uint32_t dwStylesExAdded, |
+ uint32_t dwStylesExRemoved); |
uint32_t GetStates(); |
- FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); |
- FWL_ERR SetPrivateData(void* module_id, |
- void* pData, |
- PD_CALLBACK_FREEDATA callback); |
+ FWL_Error SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); |
+ FWL_Error SetPrivateData(void* module_id, |
+ void* pData, |
+ PD_CALLBACK_FREEDATA callback); |
void* GetPrivateData(void* module_id); |
- FWL_ERR Update(); |
- FWL_ERR LockUpdate(); |
- FWL_ERR UnlockUpdate(); |
+ FWL_Error Update(); |
+ FWL_Error LockUpdate(); |
+ FWL_Error UnlockUpdate(); |
FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); |
- FWL_ERR TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); |
- FWL_ERR TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt); |
- FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); |
- FWL_ERR SetMatrix(const CFX_Matrix& matrix); |
- FWL_ERR DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL); |
+ FWL_Error TransformTo(IFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); |
+ FWL_Error TransformTo(IFWL_Widget* pWidget, CFX_RectF& rt); |
+ FWL_Error GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); |
+ FWL_Error SetMatrix(const CFX_Matrix& matrix); |
+ FWL_Error DrawWidget(CFX_Graphics* pGraphics, |
+ const CFX_Matrix* pMatrix = NULL); |
IFWL_ThemeProvider* GetThemeProvider(); |
- FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); |
- FWL_ERR SetDataProvider(IFWL_DataProvider* pDataProvider); |
+ FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); |
+ FWL_Error SetDataProvider(IFWL_DataProvider* pDataProvider); |
IFWL_WidgetDelegate* SetDelegate(IFWL_WidgetDelegate* pDelegate); |
IFWL_App* GetOwnerApp() const; |
CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent); |
// These call into equivalent polymorphic methods of m_pImpl. There |
// should be no need to override these in subclasses. |
- FWL_ERR GetClassName(CFX_WideString& wsClass) const; |
+ FWL_Error GetClassName(CFX_WideString& wsClass) const; |
uint32_t GetClassID() const; |
FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; |
- FWL_ERR Initialize(); |
- FWL_ERR Finalize(); |
+ FWL_Error Initialize(); |
+ FWL_Error Finalize(); |
CFWL_WidgetImp* GetImpl() const { return m_pImpl.get(); } |