diff options
author | Lei Zhang <thestig@chromium.org> | 2015-06-19 14:58:28 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-06-19 14:58:28 -0700 |
commit | 568aff520b4ca33d851317a4ea88807b4fd2da40 (patch) | |
tree | 02c6409057908381d36efcd556dd8082044d5509 /xfa/include/fwl/adapter | |
parent | c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec (diff) | |
download | pdfium-568aff520b4ca33d851317a4ea88807b4fd2da40.tar.xz |
Fix -Wnon-virtual-dtor warnings on the XFA branch.
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1183483003.
Diffstat (limited to 'xfa/include/fwl/adapter')
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h | 5 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adaptercursormgr.h | 2 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adaptermonitormgr.h | 4 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adapternative.h | 3 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adapterthreadmgr.h | 4 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adaptertimermgr.h | 4 | ||||
-rw-r--r-- | xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h | 3 |
7 files changed, 18 insertions, 7 deletions
diff --git a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h index 943d7caa12..55250f30de 100644 --- a/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterclipboardmgr.h @@ -6,8 +6,7 @@ #ifndef _FWL_ADAPTER_CLIPBOARDMGR_H
#define _FWL_ADAPTER_CLIPBOARDMGR_H
-class IFWL_Widget;
-class IFWL_AdapterClipboardMgr;
+
enum FWL_CLIPBOARDFORMAT {
FWL_CLIPBOARDFORMAT_Dib,
FWL_CLIPBOARDFORMAT_Text,
@@ -16,9 +15,11 @@ enum FWL_CLIPBOARDFORMAT { typedef struct _FWL_HCLIPBOARDDATA {
void* pData;
} * FWL_HCLIPBOARDDATA;
+
class IFWL_AdapterClipboardMgr
{
public:
+ virtual ~IFWL_AdapterClipboardMgr() {}
virtual FWL_ERR Empty() = 0;
virtual FX_BOOL IsDataAvailable(FX_DWORD dwFormat) = 0;
virtual FWL_HCLIPBOARDDATA GetData(FX_DWORD dwFormat) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h index 7b7b567be1..b03be66cca 100644 --- a/xfa/include/fwl/adapter/fwl_adaptercursormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptercursormgr.h @@ -25,9 +25,11 @@ enum FWL_CURSORTYPE { typedef struct _FWL_HCURSOR {
void* pData;
} *FWL_HCURSOR;
+
class IFWL_AdapterCursorMgr
{
public:
+ virtual ~IFWL_AdapterCursorMgr() {}
virtual FWL_HCURSOR GetSystemCursor(FWL_CURSORTYPE eCursorType) = 0;
virtual FWL_HCURSOR GetCustomCursor(const CFX_DIBitmap *pBitmap, FX_FLOAT xHotspot = 0, FX_FLOAT yHotspot = 0) = 0;
virtual FWL_ERR SetCursor(FWL_HCURSOR hCursor) = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h index 3da0564225..77822543d0 100644 --- a/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptermonitormgr.h @@ -6,13 +6,15 @@ #ifndef _FWL_ADAPTER_MONITORMGR_H
#define _FWL_ADAPTER_MONITORMGR_H
-class IFWL_AdapterMonitorMgr;
+
typedef struct _FWL_HMONITOR {
void* pData;
} *FWL_HMONITOR;
+
class IFWL_AdapterMonitorMgr
{
public:
+ virtual ~IFWL_AdapterMonitorMgr() {}
virtual int32_t CountMonitors() = 0;
virtual FWL_HMONITOR GetMonitor(int32_t nIndex) = 0;
virtual FWL_HMONITOR GetCurrentMonitor() = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adapternative.h b/xfa/include/fwl/adapter/fwl_adapternative.h index 55532945f9..cc348bf833 100644 --- a/xfa/include/fwl/adapter/fwl_adapternative.h +++ b/xfa/include/fwl/adapter/fwl_adapternative.h @@ -13,10 +13,11 @@ class IFWL_AdapterTimerMgr; class IFWL_AdapterCursorMgr;
class IFWL_AdapterMonitorMgr;
class IFWL_AdapterClipboardMgr;
-class IFWL_AdapterNative;
+
class IFWL_AdapterNative
{
public:
+ virtual ~IFWL_AdapterNative() {}
virtual IFWL_AdapterWidgetMgr* GetWidgetMgr(IFWL_WidgetMgrDelegate *pDelegate) = 0;
virtual IFWL_AdapterThreadMgr* GetThreadMgr() = 0;
virtual IFWL_AdapterTimerMgr* GetTimerMgr() = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h index f3e01855b0..ba2febfdb4 100644 --- a/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterthreadmgr.h @@ -7,12 +7,13 @@ #ifndef _FWL_ADAPTER_THREAD_H
#define _FWL_ADAPTER_THREAD_H
class IFWL_Thread;
-class IFWL_AdapterThreadMgr;
class IFWL_AdapterMutex;
class IFWL_AdapterSemaphore;
+
class IFWL_AdapterThreadMgr
{
public:
+ virtual ~IFWL_AdapterThreadMgr() {}
virtual FWL_ERR Start(IFWL_Thread *pThread, FWL_HTHREAD &hThread, FX_BOOL bSuspended = FALSE) = 0;
virtual FWL_ERR Resume(FWL_HTHREAD hThread) = 0;
virtual FWL_ERR Suspend(FWL_HTHREAD hThread) = 0;
@@ -23,6 +24,7 @@ public: class IFWL_AdapterSemaphore
{
public:
+ virtual ~IFWL_AdapterSemaphore() {}
static IFWL_AdapterSemaphore * Create();
virtual FWL_ERR Destroy() = 0;
virtual FWL_ERR Wait() const = 0;
diff --git a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h index 4c7f7e76dc..f3dce811fa 100644 --- a/xfa/include/fwl/adapter/fwl_adaptertimermgr.h +++ b/xfa/include/fwl/adapter/fwl_adaptertimermgr.h @@ -6,11 +6,13 @@ #ifndef _FWL_ADAPTER_TIMERMGR_H
#define _FWL_ADAPTER_TIMERMGR_H
+
class IFWL_Timer;
-class IFWL_AdapterTimerMgr;
+
class IFWL_AdapterTimerMgr
{
public:
+ virtual ~IFWL_AdapterTimerMgr() {}
virtual FWL_ERR Start(IFWL_Timer *pTimer, FX_DWORD dwElapse, FWL_HTIMER &hTimer, FX_BOOL bImmediately = TRUE) = 0;
virtual FWL_ERR Stop(FWL_HTIMER hTimer) = 0;
};
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h index 603e931084..29e91bab8c 100644 --- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h +++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h @@ -11,12 +11,13 @@ class IFWL_Menu; class IFWL_MenuDP;
class CFX_Path;
class CFX_DIBitmap;
-class IFWL_AdapterWidgetMgr;
class IFWL_AdapterMessageHook;
class IFWL_AppDelegate;
+
class IFWL_AdapterWidgetMgr
{
public:
+ virtual ~IFWL_AdapterWidgetMgr() {}
virtual FWL_ERR CreateWidget(IFWL_Widget *pWidget, IFWL_Widget *pParent = NULL) = 0;
virtual FWL_ERR DestroyWidget(IFWL_Widget *pWidget) = 0;
virtual FWL_ERR GetWidgetRect(IFWL_Widget *pWidget, CFX_RectF &rect) = 0;
|