diff options
| author | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-10 22:10:20 -0800 |
|---|---|---|
| committer | Jun Fang <jun_fang@foxitsoftware.com> | 2015-12-10 22:10:20 -0800 |
| commit | ac8c3b6ddc4ea3e5c0f365db6951a4c9bb406a57 (patch) | |
| tree | ceb1543f631e45c6c08b82927275c8b6624a32fb /xfa/src/fwl | |
| parent | c7c3f124fb4ece9a1e09ef16058c2f51947bf714 (diff) | |
| download | pdfium-ac8c3b6ddc4ea3e5c0f365db6951a4c9bb406a57.tar.xz | |
Fix compiling warnings on Linux (part2)
BUG=pdfium:261
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1500313002 .
Diffstat (limited to 'xfa/src/fwl')
| -rw-r--r-- | xfa/src/fwl/src/core/include/fwl_contentimp.h | 8 | ||||
| -rw-r--r-- | xfa/src/fwl/src/core/include/fwl_gridimp.h | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/xfa/src/fwl/src/core/include/fwl_contentimp.h b/xfa/src/fwl/src/core/include/fwl_contentimp.h index dc7ff7b681..6c83ae1b22 100644 --- a/xfa/src/fwl/src/core/include/fwl_contentimp.h +++ b/xfa/src/fwl/src/core/include/fwl_contentimp.h @@ -18,10 +18,10 @@ class CFWL_ContentImp : public CFWL_WidgetImp { virtual FWL_ERR InsertWidget(IFWL_Widget* pChild, int32_t nIndex = -1);
virtual FWL_ERR RemoveWidget(IFWL_Widget* pWidget);
virtual FWL_ERR RemoveAllWidgets();
- virtual FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight);
- virtual FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight);
- virtual FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight);
- virtual FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight);
+ FWL_ERR GetMinSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight);
+ FWL_ERR SetMinSize(FX_FLOAT fWidth, FX_FLOAT fHeight);
+ FWL_ERR GetMaxSize(FX_FLOAT& fWidth, FX_FLOAT& fHeight);
+ FWL_ERR SetMaxSize(FX_FLOAT fWidth, FX_FLOAT fHeight);
protected:
FX_FLOAT m_fWidthMin;
diff --git a/xfa/src/fwl/src/core/include/fwl_gridimp.h b/xfa/src/fwl/src/core/include/fwl_gridimp.h index 94042c16f8..ef0022eb4a 100644 --- a/xfa/src/fwl/src/core/include/fwl_gridimp.h +++ b/xfa/src/fwl/src/core/include/fwl_gridimp.h @@ -92,14 +92,14 @@ class CFWL_GridImp : public CFWL_ContentImp { virtual FWL_ERR SetSize(FWL_HGRIDCOLROW hColRow,
FX_FLOAT fSize,
FWL_GRIDUNIT eUnit);
- virtual FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit);
- virtual FWL_ERR SetMinSize(FWL_HGRIDCOLROW hColRow,
- FX_FLOAT fSize,
- FWL_GRIDUNIT eUnit);
- virtual FX_FLOAT GetMaxSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit);
- virtual FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow,
- FX_FLOAT fSize,
- FWL_GRIDUNIT eUnit);
+ FX_FLOAT GetMinSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit);
+ FWL_ERR SetMinSize(FWL_HGRIDCOLROW hColRow,
+ FX_FLOAT fSize,
+ FWL_GRIDUNIT eUnit);
+ FX_FLOAT GetMaxSize(FWL_HGRIDCOLROW hColRow, FWL_GRIDUNIT& eUnit);
+ FWL_ERR SetMaxSize(FWL_HGRIDCOLROW hColRow,
+ FX_FLOAT fSize,
+ FWL_GRIDUNIT eUnit);
virtual FX_BOOL DeleteColRow(FWL_HGRIDCOLROW hColRow);
virtual FX_BOOL IsColumn(FWL_HGRIDCOLROW hColRow);
virtual int32_t GetWidgetPos(IFWL_Widget* pWidget, FX_BOOL bColumn);
|