| Index: xfa/fxfa/app/xfa_fftextedit.h
|
| diff --git a/xfa/fxfa/app/xfa_fftextedit.h b/xfa/fxfa/app/xfa_fftextedit.h
|
| index 9b73577aab3c0743c6faf0e85c43b00cc7fc420b..d7c666743551428fdb2e4f829bec6c33dfd2d72d 100644
|
| --- a/xfa/fxfa/app/xfa_fftextedit.h
|
| +++ b/xfa/fxfa/app/xfa_fftextedit.h
|
| @@ -16,7 +16,7 @@ class CXFA_FFTextEdit : public CXFA_FFField {
|
| CXFA_FFTextEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
|
| ~CXFA_FFTextEdit() override;
|
|
|
| - // CXFA_FFField:
|
| + // CXFA_FFField
|
| FX_BOOL LoadWidget() override;
|
| void UpdateWidgetProperty() override;
|
| FX_BOOL OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) override;
|
| @@ -42,8 +42,6 @@ class CXFA_FFTextEdit : public CXFA_FFField {
|
| std::vector<CFX_ByteString>& sSuggest) override;
|
| FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf,
|
| const CFX_ByteStringC& bsReplace) override;
|
| -
|
| - // IFWL_WidgetDelegate:
|
| void OnProcessMessage(CFWL_Message* pMessage) override;
|
| void OnProcessEvent(CFWL_Event* pEvent) override;
|
| void OnDrawWidget(CFX_Graphics* pGraphics,
|
| @@ -58,10 +56,11 @@ class CXFA_FFTextEdit : public CXFA_FFField {
|
| std::vector<CFX_ByteString>& sSuggest);
|
|
|
| protected:
|
| - uint32_t GetAlignment();
|
| FX_BOOL CommitData() override;
|
| FX_BOOL UpdateFWLData() override;
|
| FX_BOOL IsDataChanged() override;
|
| +
|
| + uint32_t GetAlignment();
|
| void ValidateNumberField(const CFX_WideString& wsText);
|
|
|
| IFWL_WidgetDelegate* m_pOldDelegate;
|
| @@ -70,69 +69,75 @@ class CXFA_FFTextEdit : public CXFA_FFField {
|
| class CXFA_FFNumericEdit : public CXFA_FFTextEdit {
|
| public:
|
| CXFA_FFNumericEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
|
| - virtual ~CXFA_FFNumericEdit();
|
| - virtual FX_BOOL LoadWidget();
|
| - virtual void UpdateWidgetProperty();
|
| - virtual void OnProcessEvent(CFWL_Event* pEvent);
|
| + ~CXFA_FFNumericEdit() override;
|
| +
|
| + // CXFA_FFTextEdit
|
| + FX_BOOL LoadWidget() override;
|
| + void UpdateWidgetProperty() override;
|
| + void OnProcessEvent(CFWL_Event* pEvent) override;
|
|
|
| public:
|
| FX_BOOL OnValidate(IFWL_Widget* pWidget, CFX_WideString& wsText);
|
| };
|
| +
|
| class CXFA_FFPasswordEdit : public CXFA_FFTextEdit {
|
| public:
|
| CXFA_FFPasswordEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
|
| - virtual ~CXFA_FFPasswordEdit();
|
| - virtual FX_BOOL LoadWidget();
|
| - virtual void UpdateWidgetProperty();
|
| + ~CXFA_FFPasswordEdit() override;
|
| +
|
| + // CXFA_FFTextEdit
|
| + FX_BOOL LoadWidget() override;
|
| + void UpdateWidgetProperty() override;
|
|
|
| protected:
|
| };
|
| +
|
| enum XFA_DATETIMETYPE {
|
| XFA_DATETIMETYPE_Date = 0,
|
| XFA_DATETIMETYPE_Time,
|
| XFA_DATETIMETYPE_DateAndTime
|
| };
|
| +
|
| class CXFA_FFDateTimeEdit : public CXFA_FFTextEdit {
|
| public:
|
| CXFA_FFDateTimeEdit(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
|
| - virtual ~CXFA_FFDateTimeEdit();
|
| -
|
| - virtual FX_BOOL GetBBox(CFX_RectF& rtBox,
|
| - uint32_t dwStatus,
|
| - FX_BOOL bDrawFocus = FALSE);
|
| - virtual FX_BOOL LoadWidget();
|
| - virtual void UpdateWidgetProperty();
|
| -
|
| - virtual FX_BOOL CanUndo();
|
| - virtual FX_BOOL CanRedo();
|
| - virtual FX_BOOL Undo();
|
| - virtual FX_BOOL Redo();
|
| -
|
| - virtual FX_BOOL CanCopy();
|
| - virtual FX_BOOL CanCut();
|
| - virtual FX_BOOL CanPaste();
|
| - virtual FX_BOOL CanSelectAll();
|
| - virtual FX_BOOL Copy(CFX_WideString& wsCopy);
|
| - virtual FX_BOOL Cut(CFX_WideString& wsCut);
|
| - virtual FX_BOOL Paste(const CFX_WideString& wsPaste);
|
| - virtual FX_BOOL SelectAll();
|
| - virtual FX_BOOL Delete();
|
| - virtual FX_BOOL DeSelect();
|
| + ~CXFA_FFDateTimeEdit() override;
|
|
|
| - protected:
|
| - uint32_t GetAlignment();
|
| + // CXFA_FFTextEdit
|
| + FX_BOOL GetBBox(CFX_RectF& rtBox,
|
| + uint32_t dwStatus,
|
| + FX_BOOL bDrawFocus = FALSE) override;
|
| + FX_BOOL LoadWidget() override;
|
| + void UpdateWidgetProperty() override;
|
|
|
| - virtual FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy);
|
| - virtual FX_BOOL CommitData();
|
| - virtual FX_BOOL UpdateFWLData();
|
| - virtual FX_BOOL IsDataChanged();
|
| + 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;
|
| + void OnProcessEvent(CFWL_Event* pEvent) override;
|
|
|
| - public:
|
| void OnSelectChanged(IFWL_Widget* pWidget,
|
| int32_t iYear,
|
| int32_t iMonth,
|
| int32_t iDay);
|
| - virtual void OnProcessEvent(CFWL_Event* pEvent);
|
| +
|
| + protected:
|
| + FX_BOOL PtInActiveRect(FX_FLOAT fx, FX_FLOAT fy) override;
|
| + FX_BOOL CommitData() override;
|
| + FX_BOOL UpdateFWLData() override;
|
| + FX_BOOL IsDataChanged() override;
|
| +
|
| + uint32_t GetAlignment();
|
| };
|
|
|
| #endif // XFA_FXFA_APP_XFA_FFTEXTEDIT_H_
|
|
|