diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2015-11-04 11:53:47 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2015-11-04 11:53:47 -0500 |
| commit | 891c22686b90f4b23e741b5f1564f21831ee111c (patch) | |
| tree | 48da027a599084d8d79acabf28b279837058cac0 /fpdfsdk/include/fsdk_baseform.h | |
| parent | 1488aac2e699a5dd31bc59c3d07fe591e2d38c20 (diff) | |
| download | pdfium-891c22686b90f4b23e741b5f1564f21831ee111c.tar.xz | |
Backport CPDFSDK_BAAnnot from XFA.
On the XFA branch the CPDFSDK_Annot class has been turned into a base class
with CPDFSDK_BAAnnot serving the purpose that was served by CPDFSDK_Annot.
This CL pulls those changes into master to put it more in line with the XFA
branch. (This removes ~600 lines from the fpdfsdk/ diff).
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1408073009 .
Diffstat (limited to 'fpdfsdk/include/fsdk_baseform.h')
| -rw-r--r-- | fpdfsdk/include/fsdk_baseform.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h index f402aae76f..b356d255fe 100644 --- a/fpdfsdk/include/fsdk_baseform.h +++ b/fpdfsdk/include/fsdk_baseform.h @@ -57,7 +57,7 @@ typedef struct _PDFSDK_FieldAction { FX_BOOL bRC; // in[out] } PDFSDK_FieldAction; -class CPDFSDK_Widget : public CPDFSDK_Annot { +class CPDFSDK_Widget : public CPDFSDK_BAAnnot { public: CPDFSDK_Widget(CPDF_Annot* pAnnot, CPDFSDK_PageView* pPageView, @@ -67,6 +67,7 @@ class CPDFSDK_Widget : public CPDFSDK_Annot { // CPDFSDK_Annot CFX_ByteString GetSubType() const override; CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override; + FX_BOOL IsAppearanceValid() override; int GetLayoutOrder() const override { return 2; } @@ -161,9 +162,8 @@ class CPDFSDK_Widget : public CPDFSDK_Annot { void DrawAppearance(CFX_RenderDevice* pDevice, const CPDF_Matrix* pUser2Device, CPDF_Annot::AppearanceMode mode, - const CPDF_RenderOptions* pOptions); + const CPDF_RenderOptions* pOptions) override; - public: FX_BOOL HitTest(FX_FLOAT pageX, FX_FLOAT pageY); private: |