diff options
author | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:16:22 -0700 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-08-14 22:16:22 -0700 |
commit | 2b1a2d528469cda4e9f3e36d3c7a649e0d476480 (patch) | |
tree | 91eea8ae70b87c632a06fba52ea06c0842e30878 /fpdfsdk/include/pdfwindow/PWL_Icon.h | |
parent | 62b2e912dc2a508972fbf01b25f7449c39ff1543 (diff) | |
download | pdfium-2b1a2d528469cda4e9f3e36d3c7a649e0d476480.tar.xz |
Merge to XFA: Use override in more classes in fpdfsdk/
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1287193005 .
(cherry picked from commit 0f6b51c0fdd14f5762bf3c7412ac59c825443cc3)
Review URL: https://codereview.chromium.org/1288393004 .
Diffstat (limited to 'fpdfsdk/include/pdfwindow/PWL_Icon.h')
-rw-r--r-- | fpdfsdk/include/pdfwindow/PWL_Icon.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 7183f0245c..95157cad1f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -13,7 +13,7 @@ class CPWL_Image : public CPWL_Wnd { public: CPWL_Image(); - virtual ~CPWL_Image(); + ~CPWL_Image() override; virtual CFX_ByteString GetImageAppStream(); @@ -36,12 +36,13 @@ class CPWL_Image : public CPWL_Wnd { class CPWL_Icon : public CPWL_Image { public: CPWL_Icon(); - virtual ~CPWL_Icon(); + ~CPWL_Icon() override; virtual CPDF_IconFit* GetIconFit() { return m_pIconFit; }; - virtual void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale); - virtual void GetImageOffset(FX_FLOAT& x, FX_FLOAT& y); + // CPWL_Image + void GetScale(FX_FLOAT& fHScale, FX_FLOAT& fVScale) override; + void GetImageOffset(FX_FLOAT& x, FX_FLOAT& y) override; int32_t GetScaleMethod(); FX_BOOL IsProportionalScale(); |