From 7322343b9322b93d97077575f95a00dcca3f0451 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 28 Apr 2016 10:51:13 -0700 Subject: More FWL interface cleanup. This CL merges the IFWL_Target class into IFWL_Widget and IFWL_Thread into IFWL_App. The IFWL_WidgetMgrDelegate, IFWL_NoteDriver and IFWL_NotThread are removed in favour of their concrete classes. Review-Url: https://codereview.chromium.org/1921853006 --- xfa/fwl/core/fwl_widgetmgrimp.h | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) (limited to 'xfa/fwl/core/fwl_widgetmgrimp.h') diff --git a/xfa/fwl/core/fwl_widgetmgrimp.h b/xfa/fwl/core/fwl_widgetmgrimp.h index fa489971c5..528ecdb792 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.h +++ b/xfa/fwl/core/fwl_widgetmgrimp.h @@ -7,14 +7,21 @@ #ifndef XFA_FWL_CORE_FWL_WIDGETMGRIMP_H_ #define XFA_FWL_CORE_FWL_WIDGETMGRIMP_H_ +#include "core/fxcrt/include/fx_system.h" +#include "xfa/fwl/core/fwl_error.h" #include "xfa/fwl/core/ifwl_widgetmgr.h" -#include "xfa/fwl/core/ifwl_widgetmgrdelegate.h" #include "xfa/fxgraphics/include/cfx_graphics.h" -class IFWL_Widget; -class IFWL_AdapterWidgetMgr; +#define FWL_WGTMGR_DisableThread 0x00000001 +#define FWL_WGTMGR_DisableForm 0x00000002 + +class CFWL_Message; class CFWL_WidgetMgrDelegate; +class CFX_Graphics; +class CFX_Matrix; +class IFWL_AdapterWidgetMgr; class IFWL_AdapterNative; +class IFWL_Widget; class CFWL_WidgetMgrItem { public: @@ -136,18 +143,16 @@ class CFWL_WidgetMgr : public IFWL_WidgetMgr { #endif }; -class CFWL_WidgetMgrDelegate : public IFWL_WidgetMgrDelegate { +class CFWL_WidgetMgrDelegate { public: CFWL_WidgetMgrDelegate(CFWL_WidgetMgr* pWidgetMgr); - ~CFWL_WidgetMgrDelegate() override {} + ~CFWL_WidgetMgrDelegate() {} - // IFWL_WidgetMgrDelegate: - FWL_ERR OnSetCapability( - uint32_t dwCapability = FWL_WGTMGR_DisableThread) override; - int32_t OnProcessMessageToForm(CFWL_Message* pMessage) override; + 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) override; + const CFX_Matrix* pMatrix); protected: void DrawChild(IFWL_Widget* pParent, -- cgit v1.2.3