summaryrefslogtreecommitdiff
path: root/xfa/include/fwl
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/include/fwl')
-rw-r--r--xfa/include/fwl/adapter/fwl_sdadapterimp.h4
-rw-r--r--xfa/include/fwl/core/fwl_grid.h2
-rw-r--r--xfa/include/fwl/core/fwl_note.h2
-rw-r--r--xfa/include/fwl/core/fwl_theme.h2
-rw-r--r--xfa/include/fwl/core/fwl_widget.h2
-rw-r--r--xfa/include/fwl/lightwidget/app.h2
-rw-r--r--xfa/include/fwl/lightwidget/combobox.h2
-rw-r--r--xfa/include/fwl/lightwidget/listbox.h4
-rw-r--r--xfa/include/fwl/lightwidget/theme.h2
-rw-r--r--xfa/include/fwl/lightwidget/widget.h6
-rw-r--r--xfa/include/fwl/theme/checkboxtp.h3
-rw-r--r--xfa/include/fwl/theme/datetimepickertp.h3
-rw-r--r--xfa/include/fwl/theme/formtp.h3
-rw-r--r--xfa/include/fwl/theme/monthcalendartp.h2
-rw-r--r--xfa/include/fwl/theme/pushbuttontp.h3
-rw-r--r--xfa/include/fwl/theme/scrollbartp.h3
-rw-r--r--xfa/include/fwl/theme/widgettp.h11
17 files changed, 25 insertions, 31 deletions
diff --git a/xfa/include/fwl/adapter/fwl_sdadapterimp.h b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
index 98b2ecbaf0..6f8170ff5c 100644
--- a/xfa/include/fwl/adapter/fwl_sdadapterimp.h
+++ b/xfa/include/fwl/adapter/fwl_sdadapterimp.h
@@ -14,7 +14,7 @@ class IFWL_WidgetMgrDelegate;
class CFWL_SDAdatperNative;
class CFWL_SDAdapterWidgetMgr;
class CFWL_SDAdapterTimerMgr;
-class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr, public CFX_Object
+class CFWL_SDAdapterWidgetMgr : public IFWL_AdapterWidgetMgr
{
public:
CFWL_SDAdapterWidgetMgr();
@@ -56,7 +56,7 @@ public:
virtual FWL_ERR SetMessageHook(IFWL_AdapterMessageHook *hook);
virtual FWL_ERR GetSystemBorder(FX_FLOAT &l, FX_FLOAT &t, FX_FLOAT &r, FX_FLOAT &b);
};
-class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr, public CFX_Object
+class CFWL_SDAdapterThreadMgr : public IFWL_AdapterThreadMgr
{
public:
CFWL_SDAdapterThreadMgr();
diff --git a/xfa/include/fwl/core/fwl_grid.h b/xfa/include/fwl/core/fwl_grid.h
index 2883fd3784..e86c3dabe9 100644
--- a/xfa/include/fwl/core/fwl_grid.h
+++ b/xfa/include/fwl/core/fwl_grid.h
@@ -12,7 +12,7 @@ class IFWL_Grid;
#define FWL_CLASS_Grid L"FWL_GRID"
#define FWL_CLASSHASH_Grid 3150298670
#define FWL_GRIDSTYLEEXT_ShowGridLines (1L << 0)
-struct FWL_LAYOUTDATA : public CFX_Object {
+struct FWL_LAYOUTDATA {
FX_FLOAT fWidth;
FX_FLOAT fHeight;
};
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 01d7ae44ca..1cc88a6593 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -120,7 +120,7 @@ class IFWL_NoteLoop;
#define FWL_KEYFLAG_LButton (1 << 4)
#define FWL_KEYFLAG_RButton (1 << 5)
#define FWL_KEYFLAG_MButton (1 << 6)
-class CFWL_Note : public CFX_Object
+class CFWL_Note
{
public:
virtual FX_DWORD Release()
diff --git a/xfa/include/fwl/core/fwl_theme.h b/xfa/include/fwl/core/fwl_theme.h
index efef288afc..59d5ab0a2a 100644
--- a/xfa/include/fwl/core/fwl_theme.h
+++ b/xfa/include/fwl/core/fwl_theme.h
@@ -26,7 +26,7 @@ class IFWL_ThemeProvider;
#define FWL_WGTCAPACITY_UIMargin 12
#define FWL_WGTCAPACITY_SpaceAboveBelow 13
#define FWL_WGTCAPACITY_MAX 65535
-class CFWL_ThemePart : public CFX_Object
+class CFWL_ThemePart
{
public:
CFWL_ThemePart()
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/include/fwl/core/fwl_widget.h
index f29932f2f2..3127f0683d 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/include/fwl/core/fwl_widget.h
@@ -63,7 +63,7 @@ public:
virtual FWL_ERR OnProcessEvent(CFWL_Event *pEvent) = 0;
virtual FWL_ERR OnDrawWidget(CFX_Graphics *pGraphics, const CFX_Matrix *pMatrix = NULL) = 0;
};
-class CFWL_WidgetImpProperties : public CFX_Object
+class CFWL_WidgetImpProperties
{
public:
CFWL_WidgetImpProperties()
diff --git a/xfa/include/fwl/lightwidget/app.h b/xfa/include/fwl/lightwidget/app.h
index 11919508aa..b69be8368b 100644
--- a/xfa/include/fwl/lightwidget/app.h
+++ b/xfa/include/fwl/lightwidget/app.h
@@ -9,7 +9,7 @@
class CFWL_Theme;
class IFWL_App;
class CFWL_App;
-class CFWL_App : public CFX_Object
+class CFWL_App
{
public:
CFWL_App();
diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h
index eac58569aa..46aec5bc8a 100644
--- a/xfa/include/fwl/lightwidget/combobox.h
+++ b/xfa/include/fwl/lightwidget/combobox.h
@@ -96,7 +96,7 @@ protected:
};
CFWL_ComboBoxDP m_comboBoxData;
};
-class CFWL_ComboBoxItem : public CFX_Object
+class CFWL_ComboBoxItem
{
public:
CFWL_ComboBoxItem()
diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h
index 3cb1131e8b..55eddabb48 100644
--- a/xfa/include/fwl/lightwidget/listbox.h
+++ b/xfa/include/fwl/lightwidget/listbox.h
@@ -41,7 +41,7 @@ public:
CFWL_ListBox();
virtual ~CFWL_ListBox();
protected:
- class CFWL_ListBoxDP : public IFWL_ListBoxDP, public CFX_Object
+ class CFWL_ListBoxDP : public IFWL_ListBoxDP
{
public:
CFWL_ListBoxDP();
@@ -74,7 +74,7 @@ protected:
};
CFWL_ListBoxDP m_ListBoxDP;
};
-class CFWL_ListItem : public CFX_Object
+class CFWL_ListItem
{
public:
CFWL_ListItem()
diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h
index 95e4ed16e3..0edd9d4b3d 100644
--- a/xfa/include/fwl/lightwidget/theme.h
+++ b/xfa/include/fwl/lightwidget/theme.h
@@ -12,7 +12,7 @@ class CFWL_ThemePart;
class CFWL_WidgetTP;
class IFWL_Widget;
class CFWL_Theme;
-class CFWL_Theme : public CFX_Object
+class CFWL_Theme
{
public:
virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h
index af5bddb5e7..222ce1c768 100644
--- a/xfa/include/fwl/lightwidget/widget.h
+++ b/xfa/include/fwl/lightwidget/widget.h
@@ -13,7 +13,7 @@ class IFWL_WidgetDelegate;
class IFWL_Widget;
class CFWL_Widget;
class CFWL_WidgetDelegate;
-class CFWL_WidgetProperties : public CFX_Object
+class CFWL_WidgetProperties
{
public:
CFWL_WidgetProperties()
@@ -35,7 +35,7 @@ public:
CFWL_Widget *m_pParent;
CFWL_Widget *m_pOwner;
};
-class CFWL_Widget : public CFX_Object
+class CFWL_Widget
{
public:
IFWL_Widget* GetWidget();
@@ -89,7 +89,7 @@ public:
CFWL_WidgetMgr *m_pWidgetMgr;
CFWL_WidgetProperties *m_pProperties;
};
-class CFWL_WidgetDelegate : public CFX_Object, public IFWL_WidgetDelegate
+class CFWL_WidgetDelegate
{
public:
CFWL_WidgetDelegate();
diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h
index 384effe732..b11407063e 100644
--- a/xfa/include/fwl/theme/checkboxtp.h
+++ b/xfa/include/fwl/theme/checkboxtp.h
@@ -32,8 +32,7 @@ protected:
void DrawSignBorder(IFWL_Widget *pWidget, CFX_Graphics *pGraphics, const CFX_RectF *pRtBox, FX_BOOL bDisable = FALSE, CFX_Matrix *pMatrix = NULL);
void SetThemeData(FX_DWORD dwID);
void initCheckPath(FX_FLOAT fCheckLen);
- struct CKBThemeData : public CFX_Object {
- public:
+ struct CKBThemeData {
FX_ARGB clrBoxBk[13][2];
FX_ARGB clrSignBorderNormal;
FX_ARGB clrSignBorderDisable;
diff --git a/xfa/include/fwl/theme/datetimepickertp.h b/xfa/include/fwl/theme/datetimepickertp.h
index 01a775a6f1..39e509530c 100644
--- a/xfa/include/fwl/theme/datetimepickertp.h
+++ b/xfa/include/fwl/theme/datetimepickertp.h
@@ -18,8 +18,7 @@ public:
protected:
void DrawDropDownButton(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix);
void initThemeData();
- struct DTPThemeData : public CFX_Object {
- public:
+ struct DTPThemeData {
FX_ARGB BoxBkColor[13][2];
} *m_pThemeData;
};
diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h
index b7e68e2d5b..8f715e77b6 100644
--- a/xfa/include/fwl/theme/formtp.h
+++ b/xfa/include/fwl/theme/formtp.h
@@ -48,8 +48,7 @@ protected:
CFX_RectF m_rtDisLBorder;
CFX_RectF m_rtDisRBorder;
CFX_RectF m_rtDisBBorder;
- struct SBThemeData : public CFX_Object {
- public:
+ struct SBThemeData {
FX_ARGB clrHeadBK[2][4];
FX_ARGB clrHeadEdgeLeft[2][3];
FX_ARGB clrHeadEdgeRight[2][3];
diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h
index 55d991d404..6f0624ae9c 100644
--- a/xfa/include/fwl/theme/monthcalendartp.h
+++ b/xfa/include/fwl/theme/monthcalendartp.h
@@ -32,7 +32,7 @@ protected:
FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground *pParams, CFX_Matrix *pMatrix);
FWLTHEME_STATE GetState(FX_DWORD dwFWLStates);
void SetThemeData(FX_DWORD dwThemeID);
- class MCThemeData : public CFX_Object
+ class MCThemeData
{
public:
FX_ARGB clrCaption;
diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h
index 676a5fce50..b27afc47f4 100644
--- a/xfa/include/fwl/theme/pushbuttontp.h
+++ b/xfa/include/fwl/theme/pushbuttontp.h
@@ -30,8 +30,7 @@ protected:
void SetCornerColor(FX_DWORD *pData);
FX_INT32 GetColorID(FX_DWORD dwStates);
- struct PBThemeData : CFX_Object {
- public:
+ struct PBThemeData {
FX_ARGB clrBorder[5];
FX_ARGB clrStart[5];
FX_ARGB clrEnd[5];
diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h
index b7f1926029..3153c79ead 100644
--- a/xfa/include/fwl/theme/scrollbartp.h
+++ b/xfa/include/fwl/theme/scrollbartp.h
@@ -23,8 +23,7 @@ protected:
void DrawMaxMinBtn(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FWLTHEME_DIRECTION eDict, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
void DrawPaw(CFX_Graphics *pGraphics, const CFX_RectF *pRect, FX_BOOL bVert, FWLTHEME_STATE eState, CFX_Matrix *pMatrix = NULL);
void SetThemeData(FX_DWORD dwID);
- struct SBThemeData : public CFX_Object {
- public:
+ struct SBThemeData {
FX_ARGB clrPawColorLight[4];
FX_ARGB clrPawColorDark[4];
FX_ARGB clrBtnBK[4][2];
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index 3ede92f5d7..57348e4c75 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -6,7 +6,6 @@
#ifndef _FWL_WIDGETTP_H
#define _FWL_WIDGETTP_H
-class CFX_Object;
class IFWL_ThemeProvider;
class IFWL_Widget;
class IFDE_TextOut;
@@ -17,7 +16,7 @@ class IFX_FontSourceEnum;
#endif
class CFWL_WidgetTP;
class CFWL_ArrowData;
-class CFWL_WidgetTP : public CFX_Object
+class CFWL_WidgetTP
{
public:
virtual FX_BOOL IsValidWidget(IFWL_Widget *pWidget);
@@ -71,7 +70,7 @@ void FWLTHEME_Release();
FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID);
FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID);
FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor);
-class CFWL_ArrowData : public CFX_Object
+class CFWL_ArrowData
{
public:
static CFWL_ArrowData* GetInstance();
@@ -80,7 +79,7 @@ public:
virtual ~CFWL_ArrowData();
void SetColorData(FX_DWORD dwID);
- class CColorData : public CFX_Object
+ class CColorData
{
public:
FX_ARGB clrBorder[4];
@@ -92,7 +91,7 @@ protected:
CFWL_ArrowData();
static CFWL_ArrowData *m_pInstance;
};
-class CFWL_FontData : public CFX_Object
+class CFWL_FontData
{
public:
CFWL_FontData();
@@ -113,7 +112,7 @@ protected:
IFX_FontSourceEnum *m_pFontSource;
#endif
};
-class CFWL_FontManager : public CFX_Object
+class CFWL_FontManager
{
public:
CFWL_FontManager();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:32:02 +0000