| Index: xfa/fwl/core/fwl_widgetmgrimp.h
|
| diff --git a/xfa/fwl/core/fwl_widgetmgrimp.h b/xfa/fwl/core/fwl_widgetmgrimp.h
|
| index 0b4e2bf79dedbeafd1184dfc3127eda4341cd0e0..3dc16ab41eb90c3afbf566a9872faff56959d6c7 100644
|
| --- a/xfa/fwl/core/fwl_widgetmgrimp.h
|
| +++ b/xfa/fwl/core/fwl_widgetmgrimp.h
|
| @@ -71,8 +71,8 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr {
|
| FWL_WGTRELATION eRelation) override;
|
| int32_t GetWidgetIndex(IFWL_Widget* pWidget) override;
|
| FX_BOOL SetWidgetIndex(IFWL_Widget* pWidget, int32_t nIndex) override;
|
| - FWL_ERR RepaintWidget(IFWL_Widget* pWidget,
|
| - const CFX_RectF* pRect = NULL) override;
|
| + FWL_Error RepaintWidget(IFWL_Widget* pWidget,
|
| + const CFX_RectF* pRect = NULL) override;
|
| uint32_t GetCapability() override { return m_dwCapability; }
|
|
|
| void AddWidget(IFWL_Widget* pWidget);
|
| @@ -83,29 +83,29 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr {
|
| void SetOwner(IFWL_Widget* pOwner, IFWL_Widget* pOwned);
|
| void SetParent(IFWL_Widget* pParent, IFWL_Widget* pChild);
|
| FX_BOOL IsChild(IFWL_Widget* pChild, IFWL_Widget* pParent);
|
| - FWL_ERR CreateWidget_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR DestroyWidget_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR GetWidgetRect_Native(IFWL_Widget* pWidget, CFX_RectF& rect);
|
| - FWL_ERR SetWidgetRect_Native(IFWL_Widget* pWidget, const CFX_RectF& rect);
|
| - FWL_ERR SetWidgetPosition_Native(IFWL_Widget* pWidget,
|
| - FX_FLOAT fx,
|
| - FX_FLOAT fy);
|
| - FWL_ERR SetWidgetIcon_Native(IFWL_Widget* pWidget,
|
| - const CFX_DIBitmap* pIcon,
|
| - FX_BOOL bBig);
|
| - FWL_ERR SetWidgetCaption_Native(IFWL_Widget* pWidget,
|
| - const CFX_WideStringC& wsCaption);
|
| - FWL_ERR SetBorderRegion_Native(IFWL_Widget* pWidget, CFX_Path* pPath);
|
| - FWL_ERR ShowWidget_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR HideWidget_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR SetNormal_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR SetMaximize_Native(IFWL_Widget* pWidget);
|
| - FWL_ERR SetMinimize_Native(IFWL_Widget* pWidget);
|
| + FWL_Error CreateWidget_Native(IFWL_Widget* pWidget);
|
| + FWL_Error DestroyWidget_Native(IFWL_Widget* pWidget);
|
| + FWL_Error GetWidgetRect_Native(IFWL_Widget* pWidget, CFX_RectF& rect);
|
| + FWL_Error SetWidgetRect_Native(IFWL_Widget* pWidget, const CFX_RectF& rect);
|
| + FWL_Error SetWidgetPosition_Native(IFWL_Widget* pWidget,
|
| + FX_FLOAT fx,
|
| + FX_FLOAT fy);
|
| + FWL_Error SetWidgetIcon_Native(IFWL_Widget* pWidget,
|
| + const CFX_DIBitmap* pIcon,
|
| + FX_BOOL bBig);
|
| + FWL_Error SetWidgetCaption_Native(IFWL_Widget* pWidget,
|
| + const CFX_WideStringC& wsCaption);
|
| + FWL_Error SetBorderRegion_Native(IFWL_Widget* pWidget, CFX_Path* pPath);
|
| + FWL_Error ShowWidget_Native(IFWL_Widget* pWidget);
|
| + FWL_Error HideWidget_Native(IFWL_Widget* pWidget);
|
| + FWL_Error SetNormal_Native(IFWL_Widget* pWidget);
|
| + FWL_Error SetMaximize_Native(IFWL_Widget* pWidget);
|
| + FWL_Error SetMinimize_Native(IFWL_Widget* pWidget);
|
| FX_BOOL CheckMessage_Native();
|
| - FWL_ERR DispatchMessage_Native();
|
| + FWL_Error DispatchMessage_Native();
|
| FX_BOOL IsIdleMessage_Native();
|
| - FWL_ERR Exit_Native(int32_t iExitCode);
|
| - FWL_ERR CreateWidgetWithNativeId_Native(IFWL_Widget* pWidget, void* vp);
|
| + FWL_Error Exit_Native(int32_t iExitCode);
|
| + FWL_Error CreateWidgetWithNativeId_Native(IFWL_Widget* pWidget, void* vp);
|
| IFWL_Widget* GetWidgetAtPoint(IFWL_Widget* pParent, FX_FLOAT fx, FX_FLOAT fy);
|
| void NotifySizeChanged(IFWL_Widget* pForm, FX_FLOAT fx, FX_FLOAT fy);
|
| IFWL_Widget* nextTab(IFWL_Widget* parent, IFWL_Widget* focus, FX_BOOL& bFind);
|
| @@ -149,11 +149,11 @@ class CFWL_WidgetMgrDelegate {
|
| CFWL_WidgetMgrDelegate(CFWL_WidgetMgr* pWidgetMgr);
|
| ~CFWL_WidgetMgrDelegate() {}
|
|
|
| - FWL_ERR OnSetCapability(uint32_t dwCapability = FWL_WGTMGR_DisableThread);
|
| - int32_t OnProcessMessageToForm(CFWL_Message* pMessage);
|
| - FWL_ERR OnDrawWidget(IFWL_Widget* pWidget,
|
| - CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix);
|
| + FWL_Error OnSetCapability(uint32_t dwCapability = FWL_WGTMGR_DisableThread);
|
| + void OnProcessMessageToForm(CFWL_Message* pMessage);
|
| + FWL_Error OnDrawWidget(IFWL_Widget* pWidget,
|
| + CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix);
|
|
|
| protected:
|
| void DrawChild(IFWL_Widget* pParent,
|
|
|