| Index: fpdfsdk/cpdfsdk_widget.h
|
| diff --git a/fpdfsdk/cpdfsdk_widget.h b/fpdfsdk/cpdfsdk_widget.h
|
| index 1ab988a6603c168277aa170701827bc875ad2d17..b6307389959139d615990f1547931b07879220a3 100644
|
| --- a/fpdfsdk/cpdfsdk_widget.h
|
| +++ b/fpdfsdk/cpdfsdk_widget.h
|
| @@ -40,12 +40,12 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
| CXFA_FFWidget* GetGroupMixXFAWidget();
|
| CXFA_FFWidgetHandler* GetXFAWidgetHandler() const;
|
|
|
| - FX_BOOL HasXFAAAction(PDFSDK_XFAAActionType eXFAAAT);
|
| - FX_BOOL OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
|
| - PDFSDK_FieldAction& data,
|
| - CPDFSDK_PageView* pPageView);
|
| + bool HasXFAAAction(PDFSDK_XFAAActionType eXFAAAT);
|
| + bool OnXFAAAction(PDFSDK_XFAAActionType eXFAAAT,
|
| + PDFSDK_FieldAction& data,
|
| + CPDFSDK_PageView* pPageView);
|
|
|
| - void Synchronize(FX_BOOL bSynchronizeElse);
|
| + void Synchronize(bool bSynchronizeElse);
|
| void SynchronizeXFAValue();
|
| void SynchronizeXFAItems();
|
|
|
| @@ -66,7 +66,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
|
|
| bool IsSignatureWidget() const override;
|
| CPDF_Action GetAAction(CPDF_AAction::AActionType eAAT) override;
|
| - FX_BOOL IsAppearanceValid() override;
|
| + bool IsAppearanceValid() override;
|
|
|
| int GetLayoutOrder() const override;
|
|
|
| @@ -74,21 +74,21 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
| int GetFieldFlags() const;
|
| int GetRotate() const;
|
|
|
| - FX_BOOL GetFillColor(FX_COLORREF& color) const;
|
| - FX_BOOL GetBorderColor(FX_COLORREF& color) const;
|
| - FX_BOOL GetTextColor(FX_COLORREF& color) const;
|
| + bool GetFillColor(FX_COLORREF& color) const;
|
| + bool GetBorderColor(FX_COLORREF& color) const;
|
| + bool GetTextColor(FX_COLORREF& color) const;
|
| FX_FLOAT GetFontSize() const;
|
|
|
| int GetSelectedIndex(int nIndex) const;
|
| #ifndef PDF_ENABLE_XFA
|
| CFX_WideString GetValue() const;
|
| #else
|
| - CFX_WideString GetValue(FX_BOOL bDisplay = TRUE) const;
|
| + CFX_WideString GetValue(bool bDisplay = true) const;
|
| #endif // PDF_ENABLE_XFA
|
| CFX_WideString GetDefaultValue() const;
|
| CFX_WideString GetOptionLabel(int nIndex) const;
|
| int CountOptions() const;
|
| - FX_BOOL IsOptionSelected(int nIndex) const;
|
| + bool IsOptionSelected(int nIndex) const;
|
| int GetTopVisibleIndex() const;
|
| bool IsChecked() const;
|
| int GetAlignment() const;
|
| @@ -99,23 +99,23 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
| CFX_WideString GetAlternateName() const;
|
|
|
| void SetCheck(bool bChecked, bool bNotify);
|
| - void SetValue(const CFX_WideString& sValue, FX_BOOL bNotify);
|
| + void SetValue(const CFX_WideString& sValue, bool bNotify);
|
| void SetDefaultValue(const CFX_WideString& sValue);
|
| - void SetOptionSelection(int index, FX_BOOL bSelected, FX_BOOL bNotify);
|
| - void ClearSelection(FX_BOOL bNotify);
|
| + void SetOptionSelection(int index, bool bSelected, bool bNotify);
|
| + void ClearSelection(bool bNotify);
|
| void SetTopVisibleIndex(int index);
|
|
|
| #ifdef PDF_ENABLE_XFA
|
| - void ResetAppearance(FX_BOOL bValueChanged);
|
| + void ResetAppearance(bool bValueChanged);
|
| #endif // PDF_ENABLE_XFA
|
| - void ResetAppearance(const CFX_WideString* sValue, FX_BOOL bValueChanged);
|
| - void ResetFieldAppearance(FX_BOOL bValueChanged);
|
| + void ResetAppearance(const CFX_WideString* sValue, bool bValueChanged);
|
| + void ResetFieldAppearance(bool bValueChanged);
|
| void UpdateField();
|
| - CFX_WideString OnFormat(FX_BOOL& bFormatted);
|
| + CFX_WideString OnFormat(bool& bFormatted);
|
|
|
| - FX_BOOL OnAAction(CPDF_AAction::AActionType type,
|
| - PDFSDK_FieldAction& data,
|
| - CPDFSDK_PageView* pPageView);
|
| + bool OnAAction(CPDF_AAction::AActionType type,
|
| + PDFSDK_FieldAction& data,
|
| + CPDFSDK_PageView* pPageView);
|
|
|
| CPDFSDK_InterForm* GetInterForm() const { return m_pInterForm; }
|
| CPDF_FormField* GetFormField() const;
|
| @@ -127,18 +127,18 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
|
|
| void SetAppModified();
|
| void ClearAppModified();
|
| - FX_BOOL IsAppModified() const;
|
| + bool IsAppModified() const;
|
|
|
| int32_t GetAppearanceAge() const;
|
| int32_t GetValueAge() const;
|
|
|
| - FX_BOOL IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode);
|
| + bool IsWidgetAppearanceValid(CPDF_Annot::AppearanceMode mode);
|
| void DrawAppearance(CFX_RenderDevice* pDevice,
|
| const CFX_Matrix* pUser2Device,
|
| CPDF_Annot::AppearanceMode mode,
|
| const CPDF_RenderOptions* pOptions) override;
|
|
|
| - FX_BOOL HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
|
| + bool HitTest(FX_FLOAT pageX, FX_FLOAT pageY);
|
|
|
| private:
|
| void ResetAppearance_PushButton();
|
| @@ -163,7 +163,7 @@ class CPDFSDK_Widget : public CPDFSDK_BAAnnot {
|
| void RemoveAppearance(const CFX_ByteString& sAPType);
|
|
|
| CPDFSDK_InterForm* const m_pInterForm;
|
| - FX_BOOL m_bAppModified;
|
| + bool m_bAppModified;
|
| int32_t m_nAppAge;
|
| int32_t m_nValueAge;
|
|
|
|
|