diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-14 13:50:34 -0700 |
| commit | 6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33 (patch) | |
| tree | e2fc5ec44d0e83e7f8d066b14d1628b8f5cebe87 /xfa/include/fwl/core | |
| parent | 63de95b699a4374982c2ddffced89e0da028fe4c (diff) | |
| download | pdfium-6fc8cbb4ffbc17732045d243e1b95bc04c8a3b33.tar.xz | |
Merge to XFA: Kill CFX_Object.
Not just a simple merge, but changes to remove CFX_Object from XFA.
Original Review URL: https://codereview.chromium.org/1088733002
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1087053002
Diffstat (limited to 'xfa/include/fwl/core')
| -rw-r--r-- | xfa/include/fwl/core/fwl_grid.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/core/fwl_note.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/core/fwl_theme.h | 2 | ||||
| -rw-r--r-- | xfa/include/fwl/core/fwl_widget.h | 2 |
4 files changed, 4 insertions, 4 deletions
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()
|