| Index: xfa/fxfa/app/xfa_ffchoicelist.h
|
| diff --git a/xfa/fxfa/app/xfa_ffchoicelist.h b/xfa/fxfa/app/xfa_ffchoicelist.h
|
| index 712959d56ccc3d3835e9659fc606ea1057c2d14c..9ce6cccd11c4cf398bffc083dafcab2f845037ac 100644
|
| --- a/xfa/fxfa/app/xfa_ffchoicelist.h
|
| +++ b/xfa/fxfa/app/xfa_ffchoicelist.h
|
| @@ -16,22 +16,22 @@ class CXFA_FFListBox : public CXFA_FFField {
|
| ~CXFA_FFListBox() override;
|
|
|
| // CXFA_FFField
|
| - FX_BOOL LoadWidget() override;
|
| - FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget) override;
|
| + bool LoadWidget() override;
|
| + bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
|
| void OnProcessMessage(CFWL_Message* pMessage) override;
|
| void OnProcessEvent(CFWL_Event* pEvent) override;
|
| void OnDrawWidget(CFX_Graphics* pGraphics,
|
| const CFX_Matrix* pMatrix = nullptr) override;
|
|
|
| void OnSelectChanged(IFWL_Widget* pWidget, const CFX_Int32Array& arrSels);
|
| - void SetItemState(int32_t nIndex, FX_BOOL bSelected);
|
| + void SetItemState(int32_t nIndex, bool bSelected);
|
| void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);
|
| void DeleteItem(int32_t nIndex);
|
|
|
| protected:
|
| - FX_BOOL CommitData() override;
|
| - FX_BOOL UpdateFWLData() override;
|
| - FX_BOOL IsDataChanged() override;
|
| + bool CommitData() override;
|
| + bool UpdateFWLData() override;
|
| + bool IsDataChanged() override;
|
|
|
| uint32_t GetAlignment();
|
|
|
| @@ -44,28 +44,28 @@ class CXFA_FFComboBox : public CXFA_FFField {
|
| ~CXFA_FFComboBox() override;
|
|
|
| // CXFA_FFField
|
| - FX_BOOL GetBBox(CFX_RectF& rtBox,
|
| - uint32_t dwStatus,
|
| - FX_BOOL bDrawFocus = FALSE) override;
|
| - FX_BOOL LoadWidget() override;
|
| + bool GetBBox(CFX_RectF& rtBox,
|
| + uint32_t dwStatus,
|
| + bool bDrawFocus = false) override;
|
| + bool LoadWidget() override;
|
| void UpdateWidgetProperty() override;
|
| - FX_BOOL OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
|
| - FX_BOOL OnKillFocus(CXFA_FFWidget* pNewWidget) override;
|
| - FX_BOOL CanUndo() override;
|
| - FX_BOOL CanRedo() override;
|
| - FX_BOOL Undo() override;
|
| - FX_BOOL Redo() override;
|
| -
|
| - FX_BOOL CanCopy() override;
|
| - FX_BOOL CanCut() override;
|
| - FX_BOOL CanPaste() override;
|
| - FX_BOOL CanSelectAll() override;
|
| - FX_BOOL Copy(CFX_WideString& wsCopy) override;
|
| - FX_BOOL Cut(CFX_WideString& wsCut) override;
|
| - FX_BOOL Paste(const CFX_WideString& wsPaste) override;
|
| - FX_BOOL SelectAll() override;
|
| - FX_BOOL Delete() override;
|
| - FX_BOOL DeSelect() override;
|
| + bool OnRButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
|
| + bool OnKillFocus(CXFA_FFWidget* pNewWidget) override;
|
| + bool CanUndo() override;
|
| + bool CanRedo() override;
|
| + bool Undo() override;
|
| + bool Redo() override;
|
| +
|
| + bool CanCopy() override;
|
| + bool CanCut() override;
|
| + bool CanPaste() override;
|
| + bool CanSelectAll() override;
|
| + bool Copy(CFX_WideString& wsCopy) override;
|
| + bool Cut(CFX_WideString& wsCut) override;
|
| + bool Paste(const CFX_WideString& wsPaste) override;
|
| + bool SelectAll() override;
|
| + bool Delete() override;
|
| + bool DeSelect() override;
|
|
|
| // IFWL_WidgetDelegate
|
| void OnProcessMessage(CFWL_Message* pMessage) override;
|
| @@ -78,19 +78,19 @@ class CXFA_FFComboBox : public CXFA_FFField {
|
| void OnTextChanged(IFWL_Widget* pWidget, const CFX_WideString& wsChanged);
|
| void OnSelectChanged(IFWL_Widget* pWidget,
|
| const CFX_Int32Array& arrSels,
|
| - FX_BOOL bLButtonUp);
|
| + bool bLButtonUp);
|
| void OnPreOpen(IFWL_Widget* pWidget);
|
| void OnPostOpen(IFWL_Widget* pWidget);
|
| - void SetItemState(int32_t nIndex, FX_BOOL bSelected);
|
| + void SetItemState(int32_t nIndex, bool bSelected);
|
| void InsertItem(const CFX_WideStringC& wsLabel, int32_t nIndex = -1);
|
| void DeleteItem(int32_t nIndex);
|
|
|
| protected:
|
| // CXFA_FFField
|
| - FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) override;
|
| - FX_BOOL CommitData() override;
|
| - FX_BOOL UpdateFWLData() override;
|
| - FX_BOOL IsDataChanged() override;
|
| + bool PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) override;
|
| + bool CommitData() override;
|
| + bool UpdateFWLData() override;
|
| + bool IsDataChanged() override;
|
|
|
| uint32_t GetAlignment();
|
| void FWLEventSelChange(CXFA_EventParam* pParam);
|
|
|