From 568aff520b4ca33d851317a4ea88807b4fd2da40 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 19 Jun 2015 14:58:28 -0700 Subject: Fix -Wnon-virtual-dtor warnings on the XFA branch. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1183483003. --- xfa/src/fwl/src/basewidget/include/fwl_caretimp.h | 1 + xfa/src/fwl/src/core/include/fwl_noteimp.h | 4 +++- xfa/src/fwl/src/core/include/fwl_widgetimp.h | 1 + xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h | 4 +++- 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'xfa/src/fwl') diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h index f4d090acb4..6e9d197097 100644 --- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h +++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h @@ -37,6 +37,7 @@ protected: { public: CFWL_CaretTimer(CFWL_CaretImp *m_pCaret); + virtual ~CFWL_CaretTimer() {} virtual int32_t Run(FWL_HTIMER hTimer); CFWL_CaretImp *m_pCaret; diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h index 78afc35313..cc94b37fa4 100644 --- a/xfa/src/fwl/src/core/include/fwl_noteimp.h +++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h @@ -16,10 +16,12 @@ class CFWL_NoteLoop; class CFWL_NoteDriver; class CFWL_EventTarget; class CFWL_ToolTipContainer; + class CFWL_NoteLoop { public: CFWL_NoteLoop(CFWL_WidgetImp *pForm = NULL); + virtual ~CFWL_NoteLoop() {} virtual FX_BOOL PreProcessMessage(CFWL_Message *pMessage); virtual FWL_ERR Idle(int32_t count); CFWL_WidgetImp* GetForm(); @@ -37,7 +39,7 @@ class CFWL_NoteDriver { public: CFWL_NoteDriver(); - ~CFWL_NoteDriver(); + virtual ~CFWL_NoteDriver(); virtual FX_BOOL SendNote(CFWL_Note *pNote); virtual FX_BOOL PostMessage(CFWL_Message *pMessage); virtual FWL_ERR RegisterEventTarget(IFWL_Widget *pListener, IFWL_Widget *pEventSource = NULL, FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h index af4ceced95..fa523f390c 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h @@ -121,6 +121,7 @@ class CFWL_WidgetImpDelegate { public: CFWL_WidgetImpDelegate(); + virtual ~CFWL_WidgetImpDelegate() {} virtual int32_t OnProcessMessage(CFWL_Message *pMessage); virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent); virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL); diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h index f9b465fc52..31b978ec97 100644 --- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h +++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h @@ -49,11 +49,12 @@ public: FX_BOOL bOutsideChanged; #endif }; + class CFWL_WidgetMgr { public: CFWL_WidgetMgr(IFWL_AdapterNative *pAdapterNative); - ~CFWL_WidgetMgr(); + virtual ~CFWL_WidgetMgr(); virtual int32_t CountWidgets(IFWL_Widget *pParent = NULL); virtual IFWL_Widget* GetWidget(int32_t nIndex, IFWL_Widget *pParent = NULL); virtual IFWL_Widget* GetWidget(IFWL_Widget *pWidget, FWL_WGTRELATION eRelation); @@ -127,6 +128,7 @@ class CFWL_WidgetMgrDelegate { public: CFWL_WidgetMgrDelegate(CFWL_WidgetMgr *pWidgetMgr); + virtual ~CFWL_WidgetMgrDelegate() {} virtual FWL_ERR OnSetCapability(FX_DWORD dwCapability = FWL_WGTMGR_DisableThread); virtual int32_t OnProcessMessageToForm(CFWL_Message *pMessage); virtual FWL_ERR OnDrawWidget(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix ); -- cgit v1.2.3