summaryrefslogtreecommitdiff
path: root/xfa/src/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/src/fwl')
-rw-r--r--xfa/src/fwl/src/basewidget/include/fwl_caretimp.h2
-rw-r--r--xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h2
-rw-r--r--xfa/src/fwl/src/core/fwl_noteimp.cpp2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_formimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_gridimp.h6
-rw-r--r--xfa/src/fwl/src/core/include/fwl_noteimp.h8
-rw-r--r--xfa/src/fwl/src/core/include/fwl_targetimp.h3
-rw-r--r--xfa/src/fwl/src/core/include/fwl_threadimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_widgetimp.h2
-rw-r--r--xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h6
10 files changed, 17 insertions, 18 deletions
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
index fcae080130..673c720841 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_caretimp.h
@@ -33,7 +33,7 @@ public:
virtual FWL_ERR SetColor(CFX_Color crFill);
protected:
FX_BOOL DrawCaretBK(CFX_Graphics *pGraphics, IFWL_ThemeProvider *pTheme, const CFX_Matrix *pMatrix);
- class CFWL_CaretTimer : public CFX_Object
+ class CFWL_CaretTimer
{
public:
CFWL_CaretTimer(CFWL_CaretImp *m_pCaret);
diff --git a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
index bb859968f2..8fe41b762c 100644
--- a/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fxmath_barcodeimp.h
@@ -6,7 +6,7 @@
#ifndef _FXMATH_BARCODEIMP_H_
#define _FXMATH_BARCODEIMP_H_
-class CFX_Barcode : public IFX_Barcode, public CFX_Object
+class CFX_Barcode : public IFX_Barcode
{
public:
CFX_Barcode();
diff --git a/xfa/src/fwl/src/core/fwl_noteimp.cpp b/xfa/src/fwl/src/core/fwl_noteimp.cpp
index 417020ac0f..51041dba5b 100644
--- a/xfa/src/fwl/src/core/fwl_noteimp.cpp
+++ b/xfa/src/fwl/src/core/fwl_noteimp.cpp
@@ -808,7 +808,7 @@ void CFWL_NoteDriver::ClearInvalidEventTargets(FX_BOOL bRemoveAll)
}
}
}
-class CFWL_CoreToopTipDP : public IFWL_ToolTipDP, public CFX_Object
+class CFWL_CoreToopTipDP : public IFWL_ToolTipDP
{
public:
FWL_ERR GetCaption(IFWL_Widget *pWidget, CFX_WideString &wsCaption);
diff --git a/xfa/src/fwl/src/core/include/fwl_formimp.h b/xfa/src/fwl/src/core/include/fwl_formimp.h
index 357f8e86de..b283c121e9 100644
--- a/xfa/src/fwl/src/core/include/fwl_formimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_formimp.h
@@ -19,7 +19,7 @@ class CFWL_FormDelegate;
#define FWL_SYSBUTTONSTATE_Hover 0x0001
#define FWL_SYSBUTTONSTATE_Pressed 0x0002
#define FWL_SYSBUTTONSTATE_Disabled 0x0010
-class CFWL_SysBtn : public CFX_Object
+class CFWL_SysBtn
{
public:
CFWL_SysBtn()
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h
index 7538f1b048..1bd7ada04b 100644
--- a/xfa/src/fwl/src/core/include/fwl_gridimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h
@@ -12,7 +12,7 @@ class CFWL_GridLength;
class CFWL_GridColRow;
class CFWL_GridWidgetInfo;
class CFWL_GridImp;
-class CFWL_GridLength : public CFX_Object
+class CFWL_GridLength
{
public:
CFWL_GridLength()
@@ -28,7 +28,7 @@ public:
FX_FLOAT fLength;
FWL_GRIDUNIT eUnit;
};
-class CFWL_GridColRow : public CFX_Object
+class CFWL_GridColRow
{
public:
CFWL_GridColRow()
@@ -45,7 +45,7 @@ public:
FX_FLOAT m_fActualSize;
FX_FLOAT m_fActualPos;
};
-class CFWL_GridWidgetInfo : public CFX_Object
+class CFWL_GridWidgetInfo
{
public:
CFWL_GridWidgetInfo()
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index aeed0b3955..08ab13d3e7 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -16,7 +16,7 @@ class CFWL_NoteLoop;
class CFWL_NoteDriver;
class CFWL_EventTarget;
class CFWL_ToolTipContainer;
-class CFWL_NoteLoop : public CFX_Object
+class CFWL_NoteLoop
{
public:
CFWL_NoteLoop(CFWL_WidgetImp *pForm = NULL);
@@ -33,7 +33,7 @@ protected:
CFWL_WidgetImp *m_pForm;
FX_BOOL m_bContinueModal;
};
-class CFWL_NoteDriver : public CFX_Object
+class CFWL_NoteDriver
{
public:
CFWL_NoteDriver();
@@ -97,7 +97,7 @@ protected:
FX_LPVOID m_hookInfo;
};
typedef CFX_MapPtrTemplate<FX_LPVOID, FX_DWORD> CFWL_EventSource;
-class CFWL_EventTarget : public CFX_Object
+class CFWL_EventTarget
{
public:
CFWL_EventTarget(CFWL_NoteDriver *pNoteDriver, IFWL_Widget *pListener)
@@ -124,7 +124,7 @@ protected:
CFWL_NoteDriver *m_pNoteDriver;
FX_BOOL m_bInvalid;
};
-class CFWL_ToolTipContainer: public CFX_Object
+class CFWL_ToolTipContainer
{
public:
static CFWL_ToolTipContainer* getInstance();
diff --git a/xfa/src/fwl/src/core/include/fwl_targetimp.h b/xfa/src/fwl/src/core/include/fwl_targetimp.h
index 14e54cdebc..2fa2bf7322 100644
--- a/xfa/src/fwl/src/core/include/fwl_targetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_targetimp.h
@@ -7,8 +7,7 @@
#ifndef _FWL_TARGET_IMP_H
#define _FWL_TARGET_IMP_H
class IFWL_Target;
-class CFWL_Target;
-class CFWL_Target : public CFX_Object
+class CFWL_Target
{
public:
virtual FX_DWORD Release();
diff --git a/xfa/src/fwl/src/core/include/fwl_threadimp.h b/xfa/src/fwl/src/core/include/fwl_threadimp.h
index d7ac365c61..e03e6c6e15 100644
--- a/xfa/src/fwl/src/core/include/fwl_threadimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_threadimp.h
@@ -13,7 +13,7 @@ class IFWL_NoteDriver;
class CFWL_Thread;
class CFWL_NoteThread;
class CFWL_ControlThread;
-class CFWL_Thread : public CFX_Object
+class CFWL_Thread
{
public:
CFWL_Thread();
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 439bdac956..862bb53665 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -117,7 +117,7 @@ protected:
friend void FWL_SetWidgetStates(IFWL_Widget *widget, FX_DWORD dwStates);
friend void FWL_SetWidgetStyles(IFWL_Widget *widget, FX_DWORD dwStyles);
};
-class CFWL_WidgetImpDelegate : public CFX_Object
+class CFWL_WidgetImpDelegate
{
public:
CFWL_WidgetImpDelegate();
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index 3defb63f08..314021f9b6 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -13,7 +13,7 @@ class CFWL_WidgetMgrItem;
class CFWL_WidgetMgr;
class CFWL_WidgetMgrDelegate;
class IFWL_AdapterNative;
-class CFWL_WidgetMgrItem : public CFX_Object
+class CFWL_WidgetMgrItem
{
public:
CFWL_WidgetMgrItem()
@@ -49,7 +49,7 @@ public:
FX_BOOL bOutsideChanged;
#endif
};
-class CFWL_WidgetMgr : public CFX_Object
+class CFWL_WidgetMgr
{
public:
CFWL_WidgetMgr(IFWL_AdapterNative *pAdapterNative);
@@ -123,7 +123,7 @@ protected:
CFX_RectF m_rtScreen;
#endif
};
-class CFWL_WidgetMgrDelegate : public CFX_Object
+class CFWL_WidgetMgrDelegate
{
public:
CFWL_WidgetMgrDelegate(CFWL_WidgetMgr *pWidgetMgr);