Index: core/include/fpdfdoc/fpdf_doc.h |
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h |
index 61fbb753ba74764c7565e81714ac5961de882deb..8181a3169f7fb6471f30f0438c0938b8ca87b108 100644 |
--- a/core/include/fpdfdoc/fpdf_doc.h |
+++ b/core/include/fpdfdoc/fpdf_doc.h |
@@ -734,12 +734,10 @@ class CPDF_FormField { |
CFX_WideString GetFullName(); |
- Type GetType() { return m_Type; } |
- |
- FX_DWORD GetFlags() { return m_Flags; } |
+ Type GetType() const { return m_Type; } |
+ FX_DWORD GetFlags() const { return m_Flags; } |
CPDF_Dictionary* GetFieldDict() const { return m_pDict; } |
- |
void SetFieldDict(CPDF_Dictionary* pDict) { m_pDict = pDict; } |
FX_BOOL ResetField(FX_BOOL bNotify = FALSE); |
@@ -887,16 +885,15 @@ class CPDF_IconFit { |
#define TEXTPOS_RIGHT 4 |
#define TEXTPOS_LEFT 5 |
#define TEXTPOS_OVERLAID 6 |
+ |
class CPDF_FormControl { |
public: |
- CPDF_FormField::Type GetType() { return m_pField->GetType(); } |
+ enum HighlightingMode { None = 0, Invert, Outline, Push, Toggle }; |
+ CPDF_FormField::Type GetType() const { return m_pField->GetType(); } |
CPDF_InterForm* GetInterForm() const { return m_pForm; } |
- |
CPDF_FormField* GetField() const { return m_pField; } |
- |
CPDF_Dictionary* GetWidget() const { return m_pWidgetDict; } |
- |
CFX_FloatRect GetRect() const; |
void DrawControl(CFX_RenderDevice* pDevice, |
@@ -906,19 +903,13 @@ class CPDF_FormControl { |
const CPDF_RenderOptions* pOptions = NULL); |
CFX_ByteString GetCheckedAPState(); |
- |
CFX_WideString GetExportValue(); |
- FX_BOOL IsChecked(); |
- |
- FX_BOOL IsDefaultChecked(); |
- |
- enum HighlightingMode { None = 0, Invert, Outline, Push, Toggle }; |
+ bool IsChecked() const; |
+ bool IsDefaultChecked() const; |
HighlightingMode GetHighlightingMode(); |
- |
bool HasMKEntry(CFX_ByteString csEntry) const; |
- |
int GetRotation(); |
inline FX_ARGB GetBorderColor(int& iColorType) { |
@@ -974,8 +965,7 @@ class CPDF_FormControl { |
protected: |
CPDF_FormControl(CPDF_FormField* pField, CPDF_Dictionary* pWidgetDict); |
- CFX_ByteString GetOnStateName(); |
- |
+ CFX_ByteString GetOnStateName() const; |
void SetOnStateName(const CFX_ByteString& csOn); |
void CheckControl(FX_BOOL bChecked); |
@@ -1021,7 +1011,7 @@ class CPDF_FormNotify { |
virtual int AfterSelectionChange(const CPDF_FormField* pField) { return 0; } |
virtual int AfterCheckedStatusChange(const CPDF_FormField* pField, |
- const CFX_ByteArray& statusArray) { |
+ const std::vector<bool>& statusArray) { |
return 0; |
} |