From 816d7e4a0dccc049a1defe8a17e1b05c211665e1 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 16 Aug 2017 11:08:33 -0400 Subject: Remove CFWL_WidgetMgrDelegate This class is actually an accidentally renamed interface. There is only one concrete class so fold the interface back into the concrete class. Change-Id: If921a34595fad85750389f071ffdc9a5eae09f8e Reviewed-on: https://pdfium-review.googlesource.com/11150 Reviewed-by: Lei Zhang Commit-Queue: dsinclair --- xfa/fwl/cfwl_widgetmgr.h | 10 ++++------ xfa/fwl/ifwl_widgetmgrdelegate.h | 24 ------------------------ 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 xfa/fwl/ifwl_widgetmgrdelegate.h (limited to 'xfa/fwl') diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h index 3b26c7155d..9ea2238c4f 100644 --- a/xfa/fwl/cfwl_widgetmgr.h +++ b/xfa/fwl/cfwl_widgetmgr.h @@ -12,7 +12,6 @@ #include #include "core/fxcrt/fx_system.h" -#include "xfa/fwl/ifwl_widgetmgrdelegate.h" #include "xfa/fxgraphics/cxfa_graphics.h" #define FWL_WGTMGR_DisableForm 0x00000002 @@ -24,17 +23,16 @@ class CXFA_Graphics; class CFX_Matrix; class CFWL_Widget; -class CFWL_WidgetMgr : public CFWL_WidgetMgrDelegate { +class CFWL_WidgetMgr { public: explicit CFWL_WidgetMgr(CXFA_FFApp* pAdapterNative); ~CFWL_WidgetMgr(); - // CFWL_WidgetMgrDelegate - void OnSetCapability(uint32_t dwCapability) override; - void OnProcessMessageToForm(CFWL_Message* pMessage) override; + void OnSetCapability(uint32_t dwCapability); + void OnProcessMessageToForm(CFWL_Message* pMessage); void OnDrawWidget(CFWL_Widget* pWidget, CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) override; + const CFX_Matrix* pMatrix); CFWL_Widget* GetParentWidget(CFWL_Widget* pWidget) const; CFWL_Widget* GetOwnerWidget(CFWL_Widget* pWidget) const; diff --git a/xfa/fwl/ifwl_widgetmgrdelegate.h b/xfa/fwl/ifwl_widgetmgrdelegate.h deleted file mode 100644 index 46996821c5..0000000000 --- a/xfa/fwl/ifwl_widgetmgrdelegate.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2016 PDFium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com - -#ifndef XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_ -#define XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_ - -class CFWL_Message; -class CXFA_Graphics; -class CFX_Matrix; -class CFWL_Widget; - -class CFWL_WidgetMgrDelegate { - public: - virtual void OnSetCapability(uint32_t dwCapability) = 0; - virtual void OnProcessMessageToForm(CFWL_Message* pMessage) = 0; - virtual void OnDrawWidget(CFWL_Widget* pWidget, - CXFA_Graphics* pGraphics, - const CFX_Matrix* pMatrix) = 0; -}; - -#endif // XFA_FWL_IFWL_WIDGETMGRDELEGATE_H_ -- cgit v1.2.3