diff options
Diffstat (limited to 'xfa/fwl/basewidget')
41 files changed, 417 insertions, 289 deletions
diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.cpp b/xfa/fwl/basewidget/fwl_barcodeimp.cpp index ce9d083d83..57a3c93e9e 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fwl_barcodeimp.cpp @@ -38,13 +38,16 @@ CFWL_BarcodeImp::CFWL_BarcodeImp(const CFWL_WidgetImpProperties& properties, CFWL_BarcodeImp::~CFWL_BarcodeImp() { ReleaseBarcodeEngine(); } + FWL_Error CFWL_BarcodeImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Barcode; return FWL_Error::Succeeded; } -uint32_t CFWL_BarcodeImp::GetClassID() const { - return FWL_CLASSHASH_Barcode; + +FWL_Type CFWL_BarcodeImp::GetClassID() const { + return FWL_Type::Barcode; } + FWL_Error CFWL_BarcodeImp::Initialize() { if (!m_pDelegate) { m_pDelegate = new CFWL_BarcodeImpDelegate(this); diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.h b/xfa/fwl/basewidget/fwl_barcodeimp.h index 68c017e63e..705329572a 100644 --- a/xfa/fwl/basewidget/fwl_barcodeimp.h +++ b/xfa/fwl/basewidget/fwl_barcodeimp.h @@ -25,14 +25,16 @@ class CFWL_BarcodeImp : public CFWL_EditImp { IFWL_Widget* pOuter); ~CFWL_BarcodeImp() override; + // CFWL_WidgetImp FWL_Error GetClassName(CFX_WideString& wsClass) const override; - uint32_t GetClassID() const override; + FWL_Type GetClassID() const override; FWL_Error Initialize() override; FWL_Error Finalize() override; FWL_Error Update() override; FWL_Error DrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = nullptr) override; FWL_Error SetText(const CFX_WideString& wsText) override; + void SetType(BC_TYPE type); FX_BOOL IsProtectedType(); diff --git a/xfa/fwl/basewidget/fwl_caretimp.cpp b/xfa/fwl/basewidget/fwl_caretimp.cpp index 2b4a67cb1a..c67c0c4291 100644 --- a/xfa/fwl/basewidget/fwl_caretimp.cpp +++ b/xfa/fwl/basewidget/fwl_caretimp.cpp @@ -53,15 +53,19 @@ FWL_Error CFWL_CaretImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Caret; return FWL_Error::Succeeded; } -uint32_t CFWL_CaretImp::GetClassID() const { - return FWL_CLASSHASH_Caret; + +FWL_Type CFWL_CaretImp::GetClassID() const { + return FWL_Type::Caret; } + FWL_Error CFWL_CaretImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_CaretImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_CaretImp::Finalize() { if (m_hTimer) { FWL_StopTimer(m_hTimer); diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/basewidget/fwl_caretimp.h index c579beeed3..b1ebcfa184 100644 --- a/xfa/fwl/basewidget/fwl_caretimp.h +++ b/xfa/fwl/basewidget/fwl_caretimp.h @@ -9,6 +9,7 @@ #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/ifwl_widget.h" #include "xfa/fxgraphics/cfx_color.h" class CFWL_WidgetImpProperties; @@ -19,26 +20,25 @@ class CFWL_CaretImp : public CFWL_WidgetImp { public: CFWL_CaretImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_CaretImp(); + ~CFWL_CaretImp() override; - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - - virtual void ShowCaret(FX_BOOL bFlag = TRUE); - virtual FWL_Error GetFrequency(uint32_t& elapse); - virtual FWL_Error SetFrequency(uint32_t elapse); - virtual FWL_Error SetColor(CFX_Color crFill); + void ShowCaret(FX_BOOL bFlag = TRUE); + FWL_Error GetFrequency(uint32_t& elapse); + FWL_Error SetFrequency(uint32_t elapse); + FWL_Error SetColor(CFX_Color crFill); protected: - void DrawCaretBK(CFX_Graphics* pGraphics, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix); + friend class CFWL_CaretImpDelegate; + friend class CFWL_CaretTimer; + class CFWL_CaretTimer : public IFWL_Timer { public: explicit CFWL_CaretTimer(CFWL_CaretImp* pCaret); @@ -46,14 +46,18 @@ class CFWL_CaretImp : public CFWL_WidgetImp { int32_t Run(FWL_HTIMER hTimer) override; CFWL_CaretImp* const m_pCaret; }; + + void DrawCaretBK(CFX_Graphics* pGraphics, + IFWL_ThemeProvider* pTheme, + const CFX_Matrix* pMatrix); + CFWL_CaretTimer* m_pTimer; FWL_HTIMER m_hTimer; uint32_t m_dwElapse; CFX_Color m_crFill; FX_BOOL m_bSetColor; - friend class CFWL_CaretImpDelegate; - friend class CFWL_CaretTimer; }; + class CFWL_CaretImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_CaretImpDelegate(CFWL_CaretImp* pOwner); diff --git a/xfa/fwl/basewidget/fwl_checkboximp.cpp b/xfa/fwl/basewidget/fwl_checkboximp.cpp index a45c639450..574da160ee 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.cpp +++ b/xfa/fwl/basewidget/fwl_checkboximp.cpp @@ -52,20 +52,26 @@ CFWL_CheckBoxImp::CFWL_CheckBoxImp(const CFWL_WidgetImpProperties& properties, m_rtCaption.Reset(); m_rtFocus.Reset(); } + CFWL_CheckBoxImp::~CFWL_CheckBoxImp() {} + FWL_Error CFWL_CheckBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_CheckBox; return FWL_Error::Succeeded; } -uint32_t CFWL_CheckBoxImp::GetClassID() const { - return FWL_CLASSHASH_CheckBox; + +FWL_Type CFWL_CheckBoxImp::GetClassID() const { + return FWL_Type::CheckBox; } + FWL_Error CFWL_CheckBoxImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_CheckBoxImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_CheckBoxImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_checkboximp.h b/xfa/fwl/basewidget/fwl_checkboximp.h index cc5474db9a..89f680c985 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.h +++ b/xfa/fwl/basewidget/fwl_checkboximp.h @@ -8,6 +8,7 @@ #define XFA_FWL_BASEWIDGET_FWL_CHECKBOXIMP_H_ #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_CheckBoxImpDelegate; class CFWL_MsgMouse; @@ -18,23 +19,28 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp { public: CFWL_CheckBoxImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_CheckBoxImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual int32_t GetCheckState(); - virtual FWL_Error SetCheckState(int32_t iCheck); + ~CFWL_CheckBoxImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + int32_t GetCheckState(); + FWL_Error SetCheckState(int32_t iCheck); protected: + friend class CFWL_CheckBoxImpDelegate; + void Layout(); uint32_t GetPartStates(); void UpdateTextOutStyles(); void NextStates(); + CFX_RectF m_rtClient; CFX_RectF m_rtBox; CFX_RectF m_rtCaption; @@ -42,11 +48,12 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp { uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; FX_BOOL m_bBtnDown; - friend class CFWL_CheckBoxImpDelegate; }; + class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_CheckBoxImpDelegate(CFWL_CheckBoxImp* pOwner); + void OnProcessMessage(CFWL_Message* pMessage) override; void OnDrawWidget(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix = NULL) override; @@ -59,6 +66,7 @@ class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate { void OnMouseMove(CFWL_MsgMouse* pMsg); void OnMouseLeave(CFWL_MsgMouse* pMsg); void OnKeyDown(CFWL_MsgKey* pMsg); + CFWL_CheckBoxImp* m_pOwner; }; diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp index 7368f7bbbd..81c2fa75d3 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.cpp +++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp @@ -490,13 +490,14 @@ FWL_Error CFWL_ComboBoxImp::GetClassName(CFX_WideString& wsClass) const { return FWL_Error::Succeeded; } -uint32_t CFWL_ComboBoxImp::GetClassID() const { - return FWL_CLASSHASH_ComboBox; +FWL_Type CFWL_ComboBoxImp::GetClassID() const { + return FWL_Type::ComboBox; } FWL_Error CFWL_ComboBoxImp::Initialize() { if (m_pWidgetMgr->IsFormDisabled()) return DisForm_Initialize(); + if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; diff --git a/xfa/fwl/basewidget/fwl_comboboximp.h b/xfa/fwl/basewidget/fwl_comboboximp.h index 6fa097a4c0..45cb47d321 100644 --- a/xfa/fwl/basewidget/fwl_comboboximp.h +++ b/xfa/fwl/basewidget/fwl_comboboximp.h @@ -53,15 +53,20 @@ class CFWL_ComboListImp : public CFWL_ListBoxImp { public: CFWL_ComboListImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); + + // CFWL_WidgetImp + FWL_Error Initialize() override; + FWL_Error Finalize() override; + int32_t MatchItem(const CFX_WideString& wsMatch); void ChangeSelected(int32_t iSel); int32_t CountItems(); void GetItemRect(int32_t nIndex, CFX_RectF& rtItem); void ClientToOuter(FX_FLOAT& fx, FX_FLOAT& fy); void SetFocus(FX_BOOL bSet); + FX_BOOL m_bNotifyOwner; + friend class CFWL_ComboListImpDelegate; friend class CFWL_ComboBoxImp; }; @@ -83,55 +88,65 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { public: CFWL_ComboBoxImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_ComboBoxImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error ModifyStylesEx(uint32_t dwStylesExAdded, - uint32_t dwStylesExRemoved); - virtual void SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); - virtual FWL_Error Update(); - virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); - virtual int32_t GetCurSel(); - virtual FWL_Error SetCurSel(int32_t iSel); - virtual FWL_Error SetEditText(const CFX_WideString& wsText); - virtual int32_t GetEditTextLength() const; - virtual FWL_Error GetEditText(CFX_WideString& wsText, - int32_t nStart = 0, - int32_t nCount = -1) const; - virtual FWL_Error SetEditSelRange(int32_t nStart, int32_t nCount = -1); - virtual int32_t GetEditSelRange(int32_t nIndex, int32_t& nStart); - virtual int32_t GetEditLimit(); - virtual FWL_Error SetEditLimit(int32_t nLimit); - virtual FWL_Error EditDoClipboard(int32_t iCmd); - virtual FX_BOOL EditRedo(const CFX_ByteStringC& bsRecord); - virtual FX_BOOL EditUndo(const CFX_ByteStringC& bsRecord); - virtual IFWL_ListBox* GetListBoxt(); - virtual FX_BOOL AfterFocusShowDropList(); - virtual FWL_Error OpenDropDownList(FX_BOOL bActivate); - virtual FX_BOOL EditCanUndo(); - virtual FX_BOOL EditCanRedo(); - virtual FX_BOOL EditUndo(); - virtual FX_BOOL EditRedo(); - virtual FX_BOOL EditCanCopy(); - virtual FX_BOOL EditCanCut(); - virtual FX_BOOL EditCanSelectAll(); - virtual FX_BOOL EditCopy(CFX_WideString& wsCopy); - virtual FX_BOOL EditCut(CFX_WideString& wsCut); - virtual FX_BOOL EditPaste(const CFX_WideString& wsPaste); - virtual FX_BOOL EditSelectAll(); - virtual FX_BOOL EditDelete(); - virtual FX_BOOL EditDeSelect(); - virtual FWL_Error GetBBox(CFX_RectF& rect); - virtual FWL_Error EditModifyStylesEx(uint32_t dwStylesExAdded, - uint32_t dwStylesExRemoved); + ~CFWL_ComboBoxImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error ModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved) override; + void SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE) override; + FWL_Error Update() override; + FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; + + int32_t GetCurSel(); + FWL_Error SetCurSel(int32_t iSel); + FWL_Error SetEditText(const CFX_WideString& wsText); + int32_t GetEditTextLength() const; + FWL_Error GetEditText(CFX_WideString& wsText, + int32_t nStart = 0, + int32_t nCount = -1) const; + FWL_Error SetEditSelRange(int32_t nStart, int32_t nCount = -1); + int32_t GetEditSelRange(int32_t nIndex, int32_t& nStart); + int32_t GetEditLimit(); + FWL_Error SetEditLimit(int32_t nLimit); + FWL_Error EditDoClipboard(int32_t iCmd); + FX_BOOL EditRedo(const CFX_ByteStringC& bsRecord); + FX_BOOL EditUndo(const CFX_ByteStringC& bsRecord); + IFWL_ListBox* GetListBoxt(); + FX_BOOL AfterFocusShowDropList(); + FWL_Error OpenDropDownList(FX_BOOL bActivate); + FX_BOOL EditCanUndo(); + FX_BOOL EditCanRedo(); + FX_BOOL EditUndo(); + FX_BOOL EditRedo(); + FX_BOOL EditCanCopy(); + FX_BOOL EditCanCut(); + FX_BOOL EditCanSelectAll(); + FX_BOOL EditCopy(CFX_WideString& wsCopy); + FX_BOOL EditCut(CFX_WideString& wsCut); + FX_BOOL EditPaste(const CFX_WideString& wsPaste); + FX_BOOL EditSelectAll(); + FX_BOOL EditDelete(); + FX_BOOL EditDeSelect(); + FWL_Error GetBBox(CFX_RectF& rect); + FWL_Error EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: + friend class CFWL_ComboListImp; + friend class CFWL_ComboEditImp; + friend class CFWL_ComboEditImpDelegate; + friend class CFWL_ComboListImpDelegate; + friend class CFWL_ComboBoxImpDelegate; + friend class CFWL_ComboProxyImpDelegate; + void DrawStretchHandler(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix); FX_FLOAT GetListHeight(); void ShowDropList(FX_BOOL bActivate); @@ -177,13 +192,6 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp { FX_BOOL m_bNeedShowList; CFWL_FormProxyImp* m_pProxy; CFWL_ComboProxyImpDelegate* m_pListProxyDelegate; - - friend class CFWL_ComboListImp; - friend class CFWL_ComboEditImp; - friend class CFWL_ComboEditImpDelegate; - friend class CFWL_ComboListImpDelegate; - friend class CFWL_ComboBoxImpDelegate; - friend class CFWL_ComboProxyImpDelegate; }; class CFWL_ComboBoxImpDelegate : public CFWL_WidgetImpDelegate { public: diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp index e65b5bfb3d..a0af1a0d71 100644 --- a/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp +++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.cpp @@ -421,6 +421,7 @@ void CFWL_DateTimeCalendarImpDelegate::DisForm_OnLButtonUpEx( pDateTime->ShowMonthCalendar(FALSE); } } + CFWL_DateTimePickerImp::CFWL_DateTimePickerImp( const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) @@ -435,17 +436,22 @@ CFWL_DateTimePickerImp::CFWL_DateTimePickerImp( m_pForm(nullptr) { m_rtBtn.Set(0, 0, 0, 0); } + CFWL_DateTimePickerImp::~CFWL_DateTimePickerImp() {} + FWL_Error CFWL_DateTimePickerImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_DateTimePicker; return FWL_Error::Succeeded; } -uint32_t CFWL_DateTimePickerImp::GetClassID() const { - return FWL_CLASSHASH_DateTimePicker; + +FWL_Type CFWL_DateTimePickerImp::GetClassID() const { + return FWL_Type::DateTimePicker; } + FWL_Error CFWL_DateTimePickerImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_DateTimePickerImpDelegate(this); m_pProperties->m_dwStyleExes = FWL_STYLEEXT_DTP_ShortDateFormat; CFWL_WidgetImpProperties propMonth; @@ -469,6 +475,7 @@ FWL_Error CFWL_DateTimePickerImp::Initialize() { RegisterEventTarget(m_pEdit.get()); return FWL_Error::Succeeded; } + FWL_Error CFWL_DateTimePickerImp::Finalize() { if (m_pEdit) { m_pEdit->Finalize(); diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.h b/xfa/fwl/basewidget/fwl_datetimepickerimp.h index 3fd86bed05..8490324d9d 100644 --- a/xfa/fwl/basewidget/fwl_datetimepickerimp.h +++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.h @@ -106,42 +106,45 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp { public: CFWL_DateTimePickerImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_DateTimePickerImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual FWL_Error SetThemeProvider(IFWL_ThemeProvider* pTP); - virtual FWL_Error GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay); - virtual FWL_Error SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay); - virtual FWL_Error SetEditText(const CFX_WideString& wsText); - virtual FWL_Error GetEditText(CFX_WideString& wsText, - int32_t nStart = 0, - int32_t nCount = -1) const; + ~CFWL_DateTimePickerImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + FWL_Error SetThemeProvider(IFWL_ThemeProvider* pTP) override; + + FWL_Error GetCurSel(int32_t& iYear, int32_t& iMonth, int32_t& iDay); + FWL_Error SetCurSel(int32_t iYear, int32_t iMonth, int32_t iDay); + FWL_Error SetEditText(const CFX_WideString& wsText); + FWL_Error GetEditText(CFX_WideString& wsText, + int32_t nStart = 0, + int32_t nCount = -1) const; public: - 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 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(); - virtual FWL_Error GetBBox(CFX_RectF& rect); - virtual FWL_Error SetEditLimit(int32_t nLimit); - virtual FWL_Error ModifyEditStylesEx(uint32_t dwStylesExAdded, - uint32_t dwStylesExRemoved); + FX_BOOL CanUndo(); + FX_BOOL CanRedo(); + FX_BOOL Undo(); + FX_BOOL Redo(); + FX_BOOL CanCopy(); + FX_BOOL CanCut(); + FX_BOOL CanSelectAll(); + FX_BOOL Copy(CFX_WideString& wsCopy); + FX_BOOL Cut(CFX_WideString& wsCut); + FX_BOOL Paste(const CFX_WideString& wsPaste); + FX_BOOL SelectAll(); + FX_BOOL Delete(); + FX_BOOL DeSelect(); + FWL_Error GetBBox(CFX_RectF& rect); + FWL_Error SetEditLimit(int32_t nLimit); + FWL_Error ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); public: IFWL_DateTimeEdit* GetDataTimeEdit(); diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 563519a475..e47fb1b739 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -222,6 +222,7 @@ CFWL_EditImp::CFWL_EditImp(const CFWL_WidgetImpProperties& properties, m_rtEngine.Reset(); m_rtStatic.Reset(); } + CFWL_EditImp::~CFWL_EditImp() { if (m_pEdtEngine) { m_pEdtEngine->Release(); @@ -229,25 +230,29 @@ CFWL_EditImp::~CFWL_EditImp() { } ClearRecord(); } + FWL_Error CFWL_EditImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_Edit; return FWL_Error::Succeeded; } -uint32_t CFWL_EditImp::GetClassID() const { - return FWL_CLASSHASH_Edit; + +FWL_Type CFWL_EditImp::GetClassID() const { + return FWL_Type::Edit; } + FWL_Error CFWL_EditImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; - if (!m_pDelegate) { + if (!m_pDelegate) m_pDelegate = new CFWL_EditImpDelegate(this); - } + InitCaret(); - if (!m_pEdtEngine) { + if (!m_pEdtEngine) InitEngine(); - } + return FWL_Error::Succeeded; } + FWL_Error CFWL_EditImp::Finalize() { if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) { ShowCaret(FALSE); @@ -1507,7 +1512,7 @@ void CFWL_EditImp::Layout() { m_rtEngine.Deflate(pUIMargin->left, pUIMargin->top, pUIMargin->width, pUIMargin->height); } - } else if (m_pOuter->GetClassID() == FWL_CLASSHASH_DateTimePicker) { + } else if (m_pOuter->GetClassID() == FWL_Type::DateTimePicker) { CFWL_ThemePart part; part.m_pWidget = m_pOuter; CFX_RectF* pUIMargin = diff --git a/xfa/fwl/basewidget/fwl_editimp.h b/xfa/fwl/basewidget/fwl_editimp.h index 96e56d0c33..168726da1e 100644 --- a/xfa/fwl/basewidget/fwl_editimp.h +++ b/xfa/fwl/basewidget/fwl_editimp.h @@ -31,7 +31,7 @@ class CFWL_EditImp : public CFWL_WidgetImp { // CFWL_WidgetImp: FWL_Error GetClassName(CFX_WideString& wsClass) const override; - uint32_t GetClassID() const override; + FWL_Type GetClassID() const override; FWL_Error Initialize() override; FWL_Error Finalize() override; FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.cpp b/xfa/fwl/basewidget/fwl_formproxyimp.cpp index 1e70da64ad..2b76078e0c 100644 --- a/xfa/fwl/basewidget/fwl_formproxyimp.cpp +++ b/xfa/fwl/basewidget/fwl_formproxyimp.cpp @@ -13,14 +13,18 @@ CFWL_FormProxyImp::CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter) : CFWL_FormImp(properties, pOuter) {} + CFWL_FormProxyImp::~CFWL_FormProxyImp() {} + FWL_Error CFWL_FormProxyImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_FormProxy; return FWL_Error::Succeeded; } -uint32_t CFWL_FormProxyImp::GetClassID() const { - return FWL_CLASSHASH_FormProxy; + +FWL_Type CFWL_FormProxyImp::GetClassID() const { + return FWL_Type::FormProxy; } + FX_BOOL CFWL_FormProxyImp::IsInstance(const CFX_WideStringC& wsClass) const { if (wsClass == CFX_WideStringC(FWL_CLASS_FormProxy)) { return TRUE; diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.h b/xfa/fwl/basewidget/fwl_formproxyimp.h index 1fbff200ba..56c868e513 100644 --- a/xfa/fwl/basewidget/fwl_formproxyimp.h +++ b/xfa/fwl/basewidget/fwl_formproxyimp.h @@ -17,19 +17,22 @@ class CFWL_FormProxyImp : public CFWL_FormImp { public: CFWL_FormProxyImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_FormProxyImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); + ~CFWL_FormProxyImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; protected: friend class CFWL_FormProxyImpDelegate; }; + class CFWL_FormProxyImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_FormProxyImpDelegate(CFWL_FormProxyImp* pOwner); diff --git a/xfa/fwl/basewidget/fwl_listboximp.cpp b/xfa/fwl/basewidget/fwl_listboximp.cpp index e585a17d7d..9b05a7fee4 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.cpp +++ b/xfa/fwl/basewidget/fwl_listboximp.cpp @@ -76,20 +76,26 @@ CFWL_ListBoxImp::CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties, m_rtConent.Reset(); m_rtStatic.Reset(); } + CFWL_ListBoxImp::~CFWL_ListBoxImp() {} + FWL_Error CFWL_ListBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ListBox; return FWL_Error::Succeeded; } -uint32_t CFWL_ListBoxImp::GetClassID() const { - return FWL_CLASSHASH_ListBox; + +FWL_Type CFWL_ListBoxImp::GetClassID() const { + return FWL_Type::ListBox; } + FWL_Error CFWL_ListBoxImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_ListBoxImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_ListBoxImp::Finalize() { if (m_pVertScrollBar) { m_pVertScrollBar->Finalize(); diff --git a/xfa/fwl/basewidget/fwl_listboximp.h b/xfa/fwl/basewidget/fwl_listboximp.h index 0d938fe778..f32dece8dc 100644 --- a/xfa/fwl/basewidget/fwl_listboximp.h +++ b/xfa/fwl/basewidget/fwl_listboximp.h @@ -24,25 +24,31 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { public: CFWL_ListBoxImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_ListBoxImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider); - virtual int32_t CountSelItems(); - virtual FWL_HLISTITEM GetSelItem(int32_t nIndexSel); - virtual int32_t GetSelIndex(int32_t nIndex); - virtual FWL_Error SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE); - virtual FWL_Error GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText); - virtual FWL_Error GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert = TRUE); + ~CFWL_ListBoxImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + FWL_Error SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override; + + int32_t CountSelItems(); + FWL_HLISTITEM GetSelItem(int32_t nIndexSel); + int32_t GetSelIndex(int32_t nIndex); + FWL_Error SetSelItem(FWL_HLISTITEM hItem, FX_BOOL bSelect = TRUE); + FWL_Error GetItemText(FWL_HLISTITEM hItem, CFX_WideString& wsText); + FWL_Error GetScrollPos(FX_FLOAT& fPos, FX_BOOL bVert = TRUE); + FWL_Error* Sort(IFWL_ListBoxCompare* pCom); protected: + friend class CFWL_ListBoxImpDelegate; + FWL_HLISTITEM GetItem(FWL_HLISTITEM hItem, uint32_t dwKeyCode); void SetSelection(FWL_HLISTITEM hStart, FWL_HLISTITEM hEnd, @@ -84,7 +90,6 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { FX_BOOL IsShowScrollBar(FX_BOOL bVert); void ProcessSelChanged(); - protected: CFX_RectF m_rtClient; CFX_RectF m_rtStatic; CFX_RectF m_rtConent; @@ -97,7 +102,6 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp { FX_FLOAT m_fScorllBarWidth; FX_BOOL m_bLButtonDown; IFWL_ThemeProvider* m_pScrollBarTP; - friend class CFWL_ListBoxImpDelegate; }; class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate { public: diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp index 2d495d1fd5..e8672e67dc 100644 --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.cpp @@ -175,24 +175,30 @@ CFWL_MonthCalendarImp::CFWL_MonthCalendarImp( m_bInit = FALSE; m_iMaxSel = 1; } + CFWL_MonthCalendarImp::~CFWL_MonthCalendarImp() { ClearDateItem(); delete m_pDateTime; m_arrSelDays.RemoveAll(); } + FWL_Error CFWL_MonthCalendarImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_MonthCalendar; return FWL_Error::Succeeded; } -uint32_t CFWL_MonthCalendarImp::GetClassID() const { - return FWL_CLASSHASH_MonthCalendar; + +FWL_Type CFWL_MonthCalendarImp::GetClassID() const { + return FWL_Type::MonthCalendar; } + FWL_Error CFWL_MonthCalendarImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_MonthCalendarImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_MonthCalendarImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.h b/xfa/fwl/basewidget/fwl_monthcalendarimp.h index d1096b40ce..e44a17a1d3 100644 --- a/xfa/fwl/basewidget/fwl_monthcalendarimp.h +++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.h @@ -9,6 +9,7 @@ #include "xfa/fgas/localization/fgas_datetime.h" #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_MonthCalendarImpDelegate; class CFWL_MsgMouse; @@ -23,21 +24,23 @@ class CFWL_MonthCalendarImp : public CFWL_WidgetImp { public: CFWL_MonthCalendarImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_MonthCalendarImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual int32_t CountSelect(); - virtual FX_BOOL GetSelect(int32_t& iYear, - int32_t& iMonth, - int32_t& iDay, - int32_t nIndex = 0); - virtual FX_BOOL SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay); + ~CFWL_MonthCalendarImp() override; + + // FWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + int32_t CountSelect(); + FX_BOOL GetSelect(int32_t& iYear, + int32_t& iMonth, + int32_t& iDay, + int32_t nIndex = 0); + FX_BOOL SetSelect(int32_t iYear, int32_t iMonth, int32_t iDay); protected: struct DATE { diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.cpp b/xfa/fwl/basewidget/fwl_pictureboximp.cpp index c2cd09d342..a84cc8c5e8 100644 --- a/xfa/fwl/basewidget/fwl_pictureboximp.cpp +++ b/xfa/fwl/basewidget/fwl_pictureboximp.cpp @@ -34,20 +34,26 @@ CFWL_PictureBoxImp::CFWL_PictureBoxImp( m_rtImage.Reset(); m_matrix.SetIdentity(); } + CFWL_PictureBoxImp::~CFWL_PictureBoxImp() {} + FWL_Error CFWL_PictureBoxImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_PictureBox; return FWL_Error::Succeeded; } -uint32_t CFWL_PictureBoxImp::GetClassID() const { - return FWL_CLASSHASH_PictureBox; + +FWL_Type CFWL_PictureBoxImp::GetClassID() const { + return FWL_Type::PictureBox; } + FWL_Error CFWL_PictureBoxImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_PictureBoxImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_PictureBoxImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.h b/xfa/fwl/basewidget/fwl_pictureboximp.h index d6f0ccc935..9fa065216a 100644 --- a/xfa/fwl/basewidget/fwl_pictureboximp.h +++ b/xfa/fwl/basewidget/fwl_pictureboximp.h @@ -8,6 +8,7 @@ #define XFA_FWL_BASEWIDGET_FWL_PICTUREBOXIMP_H_ #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -17,20 +18,25 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp { public: CFWL_PictureBoxImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_PictureBoxImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); + ~CFWL_PictureBoxImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; protected: + friend class CFWL_PictureBoxImpDelegate; + void DrawBkground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix = NULL); + FX_BOOL VStyle(FX_BOOL dwStyle); CFX_RectF m_rtClient; CFX_RectF m_rtImage; @@ -38,7 +44,6 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp { FX_BOOL m_bTop; FX_BOOL m_bVCenter; FX_BOOL m_bButton; - friend class CFWL_PictureBoxImpDelegate; }; class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate { diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp index 3b18ad0fa0..77c93f4537 100644 --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp @@ -38,20 +38,26 @@ CFWL_PushButtonImp::CFWL_PushButtonImp( m_rtClient.Set(0, 0, 0, 0); m_rtCaption.Set(0, 0, 0, 0); } + CFWL_PushButtonImp::~CFWL_PushButtonImp() {} + FWL_Error CFWL_PushButtonImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_PushButton; return FWL_Error::Succeeded; } -uint32_t CFWL_PushButtonImp::GetClassID() const { - return FWL_CLASSHASH_PushButton; + +FWL_Type CFWL_PushButtonImp::GetClassID() const { + return FWL_Type::PushButton; } + FWL_Error CFWL_PushButtonImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_PushButtonImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_PushButtonImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.h b/xfa/fwl/basewidget/fwl_pushbuttonimp.h index 89913be6c1..79a4859cc9 100644 --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.h +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.h @@ -8,6 +8,7 @@ #define XFA_FWL_BASEWIDGET_FWL_PUSHBUTTONIMP_H_ #include "xfa/fwl/core/fwl_widgetimp.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_MsgMouse; class CFWL_WidgetImpProperties; @@ -18,18 +19,22 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp { public: CFWL_PushButtonImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_PushButtonImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual void SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); + ~CFWL_PushButtonImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + void SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; protected: + friend class CFWL_PushButtonImpDelegate; + void DrawBkground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); @@ -38,12 +43,12 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp { const CFX_Matrix* pMatrix); uint32_t GetPartStates(); void UpdateTextOutStyles(); + CFX_RectF m_rtClient; CFX_RectF m_rtCaption; FX_BOOL m_bBtnDown; uint32_t m_dwTTOStyles; int32_t m_iTTOAlign; - friend class CFWL_PushButtonImpDelegate; }; class CFWL_PushButtonImpDelegate : public CFWL_WidgetImpDelegate { diff --git a/xfa/fwl/basewidget/fwl_scrollbarimp.cpp b/xfa/fwl/basewidget/fwl_scrollbarimp.cpp index b03846da91..17f98059be 100644 --- a/xfa/fwl/basewidget/fwl_scrollbarimp.cpp +++ b/xfa/fwl/basewidget/fwl_scrollbarimp.cpp @@ -98,20 +98,26 @@ CFWL_ScrollBarImp::CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties, m_rtMinTrack.Reset(); m_rtMaxTrack.Reset(); } + CFWL_ScrollBarImp::~CFWL_ScrollBarImp() {} + FWL_Error CFWL_ScrollBarImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ScrollBar; return FWL_Error::Succeeded; } -uint32_t CFWL_ScrollBarImp::GetClassID() const { - return FWL_CLASSHASH_ScrollBar; + +FWL_Type CFWL_ScrollBarImp::GetClassID() const { + return FWL_Type::ScrollBar; } + FWL_Error CFWL_ScrollBarImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_ScrollBarImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_ScrollBarImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_scrollbarimp.h b/xfa/fwl/basewidget/fwl_scrollbarimp.h index 6cee702f5c..ad10e207db 100644 --- a/xfa/fwl/basewidget/fwl_scrollbarimp.h +++ b/xfa/fwl/basewidget/fwl_scrollbarimp.h @@ -9,6 +9,7 @@ #include "xfa/fwl/core/fwl_widgetimp.h" #include "xfa/fwl/core/ifwl_timer.h" +#include "xfa/fwl/core/ifwl_widget.h" class CFWL_WidgetImpProperties; class IFWL_Widget; @@ -18,31 +19,38 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { public: CFWL_ScrollBarImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_ScrollBarImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual FX_BOOL IsVertical(); - virtual FWL_Error GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax); - virtual FWL_Error SetRange(FX_FLOAT fMin, FX_FLOAT fMax); - virtual FX_FLOAT GetPageSize(); - virtual FWL_Error SetPageSize(FX_FLOAT fPageSize); - virtual FX_FLOAT GetStepSize(); - virtual FWL_Error SetStepSize(FX_FLOAT fStepSize); - virtual FX_FLOAT GetPos(); - virtual FWL_Error SetPos(FX_FLOAT fPos); - virtual FX_FLOAT GetTrackPos(); - virtual FWL_Error SetTrackPos(FX_FLOAT fTrackPos); - virtual FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); - virtual FWL_Error SetOuter(IFWL_Widget* pOuter); - virtual int32_t Run(FWL_HTIMER hTimer); + ~CFWL_ScrollBarImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + + // IFWL_Timer + int32_t Run(FWL_HTIMER hTimer) override; + + FX_BOOL IsVertical(); + FWL_Error GetRange(FX_FLOAT& fMin, FX_FLOAT& fMax); + FWL_Error SetRange(FX_FLOAT fMin, FX_FLOAT fMax); + FX_FLOAT GetPageSize(); + FWL_Error SetPageSize(FX_FLOAT fPageSize); + FX_FLOAT GetStepSize(); + FWL_Error SetStepSize(FX_FLOAT fStepSize); + FX_FLOAT GetPos(); + FWL_Error SetPos(FX_FLOAT fPos); + FX_FLOAT GetTrackPos(); + FWL_Error SetTrackPos(FX_FLOAT fTrackPos); + FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); + FWL_Error SetOuter(IFWL_Widget* pOuter); protected: + friend class CFWL_ScrollBarImpDelegate; + void DrawTrack(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, FX_BOOL bLower = TRUE, @@ -96,8 +104,8 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer { CFX_RectF m_rtMaxTrack; FX_BOOL m_bCustomLayout; FX_FLOAT m_fMinThumb; - friend class CFWL_ScrollBarImpDelegate; }; + class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_ScrollBarImpDelegate(CFWL_ScrollBarImp* pOwner); diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp b/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp index 27b84bae92..25c8a35983 100644 --- a/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp +++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.cpp @@ -58,20 +58,26 @@ CFWL_SpinButtonImp::CFWL_SpinButtonImp( m_rtDnButton.Reset(); m_pProperties->m_dwStyleExes |= FWL_STYLEEXE_SPB_Vert; } + CFWL_SpinButtonImp::~CFWL_SpinButtonImp() {} + FWL_Error CFWL_SpinButtonImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_SpinButton; return FWL_Error::Succeeded; } -uint32_t CFWL_SpinButtonImp::GetClassID() const { - return FWL_CLASSHASH_SpinButton; + +FWL_Type CFWL_SpinButtonImp::GetClassID() const { + return FWL_Type::SpinButton; } + FWL_Error CFWL_SpinButtonImp::Initialize() { if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_SpinButtonImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_SpinButtonImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/basewidget/fwl_spinbuttonimp.h index aa963c9da4..068fbd888f 100644 --- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h +++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.h @@ -19,27 +19,35 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { public: CFWL_SpinButtonImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - ~CFWL_SpinButtonImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual int32_t Run(FWL_HTIMER hTimer); + ~CFWL_SpinButtonImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + + // IFWL_Timer + int32_t Run(FWL_HTIMER hTimer) override; + FWL_Error EnableButton(FX_BOOL bEnable, FX_BOOL bUp = TRUE); FX_BOOL IsButtonEnable(FX_BOOL bUp = TRUE); protected: + friend class CFWL_SpinButtonImpDelegate; + void DrawUpButton(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); void DrawDownButton(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme, const CFX_Matrix* pMatrix); + CFX_RectF m_rtClient; CFX_RectF m_rtUpButton; CFX_RectF m_rtDnButton; @@ -48,7 +56,6 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer { int32_t m_iButtonIndex; FX_BOOL m_bLButtonDwn; FWL_HTIMER m_hTimer; - friend class CFWL_SpinButtonImpDelegate; }; class CFWL_SpinButtonImpDelegate : public CFWL_WidgetImpDelegate { public: diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp index f1878edee8..9ac9c31160 100644 --- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp +++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.cpp @@ -57,27 +57,33 @@ CFWL_ToolTipImp::CFWL_ToolTipImp(const CFWL_WidgetImpProperties& properties, m_TimerShow.m_pToolTip = this; m_TimerHide.m_pToolTip = this; } + CFWL_ToolTipImp::~CFWL_ToolTipImp() { if (m_pTimer) { delete m_pTimer; m_pTimer = NULL; } } + FWL_Error CFWL_ToolTipImp::GetClassName(CFX_WideString& wsClass) const { wsClass = FWL_CLASS_ToolTip; return FWL_Error::Succeeded; } -uint32_t CFWL_ToolTipImp::GetClassID() const { - return FWL_CLASSHASH_ToolTip; + +FWL_Type CFWL_ToolTipImp::GetClassID() const { + return FWL_Type::ToolTip; } + FWL_Error CFWL_ToolTipImp::Initialize() { m_pProperties->m_dwStyles |= FWL_WGTSTYLE_Popup; m_pProperties->m_dwStyles &= ~FWL_WGTSTYLE_Child; if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded) return FWL_Error::Indefinite; + m_pDelegate = new CFWL_ToolTipImpDelegate(this); return FWL_Error::Succeeded; } + FWL_Error CFWL_ToolTipImp::Finalize() { delete m_pDelegate; m_pDelegate = nullptr; diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h index 16ff424c7c..6d7af8dc89 100644 --- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h +++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h @@ -19,38 +19,48 @@ class CFWL_ToolTipImp : public CFWL_FormImp { public: CFWL_ToolTipImp(const CFWL_WidgetImpProperties& properties, IFWL_Widget* pOuter); - virtual ~CFWL_ToolTipImp(); - virtual FWL_Error GetClassName(CFX_WideString& wsClass) const; - virtual uint32_t GetClassID() const; - virtual FWL_Error Initialize(); - virtual FWL_Error Finalize(); - virtual FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE); - virtual FWL_Error Update(); - virtual FWL_Error DrawWidget(CFX_Graphics* pGraphics, - const CFX_Matrix* pMatrix = NULL); - virtual void SetStates(uint32_t dwStates, FX_BOOL bSet); - virtual FWL_Error GetClientRect(CFX_RectF& rect); + ~CFWL_ToolTipImp() override; + + // CFWL_WidgetImp + FWL_Error GetClassName(CFX_WideString& wsClass) const override; + FWL_Type GetClassID() const override; + FWL_Error Initialize() override; + FWL_Error Finalize() override; + FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override; + FWL_Error Update() override; + FWL_Error DrawWidget(CFX_Graphics* pGraphics, + const CFX_Matrix* pMatrix = nullptr) override; + void SetStates(uint32_t dwStates, FX_BOOL bSet) override; + FWL_Error GetClientRect(CFX_RectF& rect) override; + void SetAnchor(const CFX_RectF& rtAnchor); void Show(); void Hide(); protected: - void DrawBkground(CFX_Graphics* pGraphics, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix); - void DrawText(CFX_Graphics* pGraphics, - IFWL_ThemeProvider* pTheme, - const CFX_Matrix* pMatrix); - void UpdateTextOutStyles(); - void RefreshToolTipPos(); + friend class CFWL_ToolTipImpDelegate; + friend class CFWL_ToolTipTimer; + class CFWL_ToolTipTimer : public IFWL_Timer { public: CFWL_ToolTipTimer() {} ~CFWL_ToolTipTimer() {} + CFWL_ToolTipTimer(CFWL_ToolTipImp* pToolTip); virtual int32_t Run(FWL_HTIMER hTimer); + CFWL_ToolTipImp* m_pToolTip; }; + + void DrawBkground(CFX_Graphics* pGraphics, + IFWL_ThemeProvider* pTheme, + const CFX_Matrix* pMatrix); + void DrawText(CFX_Graphics* pGraphics, + IFWL_ThemeProvider* pTheme, + const CFX_Matrix* pMatrix); + void UpdateTextOutStyles(); + void RefreshToolTipPos(); + CFX_RectF m_rtClient; CFX_RectF m_rtCaption; FX_BOOL m_bBtnDown; @@ -62,9 +72,8 @@ class CFWL_ToolTipImp : public CFWL_FormImp { CFWL_ToolTipTimer* m_pTimer; CFWL_ToolTipTimer m_TimerShow; CFWL_ToolTipTimer m_TimerHide; - friend class CFWL_ToolTipImpDelegate; - friend class CFWL_ToolTipTimer; }; + class CFWL_ToolTipImpDelegate : public CFWL_WidgetImpDelegate { public: CFWL_ToolTipImpDelegate(CFWL_ToolTipImp* pOwner); diff --git a/xfa/fwl/basewidget/ifwl_barcode.h b/xfa/fwl/basewidget/ifwl_barcode.h index 6cc4c59112..13652009eb 100644 --- a/xfa/fwl/basewidget/ifwl_barcode.h +++ b/xfa/fwl/basewidget/ifwl_barcode.h @@ -13,7 +13,6 @@ class CFWL_WidgetImpProperties; #define FWL_CLASS_Barcode L"FWL_BARCODE" -#define FWL_CLASSHASH_Barcode 366886968 enum FWL_BCDAttribute { FWL_BCDATTRIBUTE_NONE = 0, diff --git a/xfa/fwl/basewidget/ifwl_caret.h b/xfa/fwl/basewidget/ifwl_caret.h index c7481bdb3c..8648ca0a4b 100644 --- a/xfa/fwl/basewidget/ifwl_caret.h +++ b/xfa/fwl/basewidget/ifwl_caret.h @@ -11,7 +11,6 @@ #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #define FWL_CLASS_Caret L"FWL_CARET" -#define FWL_CLASSHASH_Caret 671181879 #define FWL_STATE_CAT_HightLight 1 class IFWL_Caret : public IFWL_Widget { diff --git a/xfa/fwl/basewidget/ifwl_checkbox.h b/xfa/fwl/basewidget/ifwl_checkbox.h index 83c0dd4724..26b82443fa 100644 --- a/xfa/fwl/basewidget/ifwl_checkbox.h +++ b/xfa/fwl/basewidget/ifwl_checkbox.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #define FWL_CLASS_CheckBox L"FWL_CHECKBOX" -#define FWL_CLASSHASH_CheckBox 4107183823 #define FWL_STYLEEXT_CKB_Left (0L << 0) #define FWL_STYLEEXT_CKB_Center (1L << 0) #define FWL_STYLEEXT_CKB_Right (2L << 0) diff --git a/xfa/fwl/basewidget/ifwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h index 92e213f9d0..916e60b5bb 100644 --- a/xfa/fwl/basewidget/ifwl_combobox.h +++ b/xfa/fwl/basewidget/ifwl_combobox.h @@ -14,7 +14,6 @@ class CFWL_WidgetImpProperties; class IFWL_ComboBox; #define FWL_CLASS_ComboBox L"FWL_COMBOBOX" -#define FWL_CLASSHASH_ComboBox 602353697 #define FWL_STYLEEXT_CMB_DropList (0L << 0) #define FWL_STYLEEXT_CMB_DropDown (1L << 0) #define FWL_STYLEEXT_CMB_Sort (1L << 1) diff --git a/xfa/fwl/basewidget/ifwl_datetimepicker.h b/xfa/fwl/basewidget/ifwl_datetimepicker.h index 446f988fd3..7aba68b5a0 100644 --- a/xfa/fwl/basewidget/ifwl_datetimepicker.h +++ b/xfa/fwl/basewidget/ifwl_datetimepicker.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #define FWL_CLASS_DateTimePicker L"FWL_DATETIMEPICKER" -#define FWL_CLASSHASH_DateTimePicker 3851176257 #define FWL_STYLEEXT_DTP_AllowEdit (1L << 0) #define FWL_STYLEEXT_DTP_LongDateFormat (0L << 1) #define FWL_STYLEEXT_DTP_ShortDateFormat (1L << 1) diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h index 87f55d7d1e..6260ce80b6 100644 --- a/xfa/fwl/basewidget/ifwl_edit.h +++ b/xfa/fwl/basewidget/ifwl_edit.h @@ -14,7 +14,6 @@ #include "xfa/fwl/lightwidget/cfwl_widget.h" #define FWL_CLASS_Edit L"FWL_EDIT" -#define FWL_CLASSHASH_Edit 2893987822 #define FWL_STYLEEXT_EDT_ReadOnly (1L << 0) #define FWL_STYLEEXT_EDT_MultiLine (1L << 1) #define FWL_STYLEEXT_EDT_WantReturn (1L << 2) diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h index 8b1e20b28f..9782cbbc29 100644 --- a/xfa/fwl/basewidget/ifwl_listbox.h +++ b/xfa/fwl/basewidget/ifwl_listbox.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #define FWL_CLASS_ListBox L"FWL_LISTBOX" -#define FWL_CLASSHASH_ListBox 1777358317 #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0) #define FWL_STYLEEXT_LTB_ShowScrollBarAlaways (1L << 2) #define FWL_STYLEEXT_LTB_MultiColumn (1L << 3) diff --git a/xfa/fwl/basewidget/ifwl_monthcalendar.h b/xfa/fwl/basewidget/ifwl_monthcalendar.h index 38e06f265b..027d25b426 100644 --- a/xfa/fwl/basewidget/ifwl_monthcalendar.h +++ b/xfa/fwl/basewidget/ifwl_monthcalendar.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/cfwl_widgetimpproperties.h" #define FWL_CLASS_MonthCalendar L"FWL_MONTHCALENDAR" -#define FWL_CLASSHASH_MonthCalendar 2733931374 #define FWL_STYLEEXT_MCD_MultiSelect (1L << 0) #define FWL_STYLEEXT_MCD_NoToday (1L << 1) #define FWL_STYLEEXT_MCD_NoTodayCircle (1L << 2) diff --git a/xfa/fwl/basewidget/ifwl_picturebox.h b/xfa/fwl/basewidget/ifwl_picturebox.h index d039a8a1b2..8ff4981e11 100644 --- a/xfa/fwl/basewidget/ifwl_picturebox.h +++ b/xfa/fwl/basewidget/ifwl_picturebox.h @@ -14,7 +14,6 @@ #include "xfa/fwl/core/fwl_error.h" #define FWL_CLASS_PictureBox L"FWL_PICTUREBOX" -#define FWL_CLASSHASH_PictureBox 2974721741 #define FWL_STYLEEXT_PTB_Left 0L << 0 #define FWL_STYLEEXT_PTB_Center 1L << 0 #define FWL_STYLEEXT_PTB_Right 2L << 0 diff --git a/xfa/fwl/basewidget/ifwl_pushbutton.h b/xfa/fwl/basewidget/ifwl_pushbutton.h index 32e1e17215..aa8392d9db 100644 --- a/xfa/fwl/basewidget/ifwl_pushbutton.h +++ b/xfa/fwl/basewidget/ifwl_pushbutton.h @@ -13,7 +13,6 @@ #include "xfa/fwl/core/ifwl_widget.h" #define FWL_CLASS_PushButton L"FWL_PUSHBUTTON" -#define FWL_CLASSHASH_PushButton 3521614244 #define FWL_STYLEEXT_PSB_Left (0L << 0) #define FWL_STYLEEXT_PSB_Center (1L << 0) #define FWL_STYLEEXT_PSB_Right (2L << 0) diff --git a/xfa/fwl/basewidget/ifwl_scrollbar.h b/xfa/fwl/basewidget/ifwl_scrollbar.h index 176b997a3d..bc5c722ca9 100644 --- a/xfa/fwl/basewidget/ifwl_scrollbar.h +++ b/xfa/fwl/basewidget/ifwl_scrollbar.h @@ -15,7 +15,6 @@ #include "xfa/fwl/core/fwl_error.h" #define FWL_CLASS_ScrollBar L"FWL_SCROLLBAR" -#define FWL_CLASSHASH_ScrollBar 2826584844 #define FWL_STYLEEXT_SCB_Horz (0L << 0) #define FWL_STYLEEXT_SCB_Vert (1L << 0) diff --git a/xfa/fwl/basewidget/ifwl_spinbutton.h b/xfa/fwl/basewidget/ifwl_spinbutton.h index 5f032d9e7e..0b433d407a 100644 --- a/xfa/fwl/basewidget/ifwl_spinbutton.h +++ b/xfa/fwl/basewidget/ifwl_spinbutton.h @@ -10,7 +10,6 @@ #include "xfa/fwl/core/fwl_widgetimp.h" #define FWL_CLASS_SpinButton L"FWL_SPINBUTTON" -#define FWL_CLASSHASH_SpinButton 3793043646 #define FWL_STYLEEXE_SPB_Vert (1L << 0) BEGIN_FWL_EVENT_DEF(CFWL_EvtSpbClick, CFWL_EventType::Click) diff --git a/xfa/fwl/basewidget/ifwl_tooltip.h b/xfa/fwl/basewidget/ifwl_tooltip.h index 1a4280fccf..5b8dff1b3b 100644 --- a/xfa/fwl/basewidget/ifwl_tooltip.h +++ b/xfa/fwl/basewidget/ifwl_tooltip.h @@ -13,7 +13,6 @@ class CFWL_WidgetImpProperties; class IFWL_ToolTip; #define FWL_CLASS_ToolTip L"FWL_TOOLTIP" -#define FWL_CLASSHASH_ToolTip 1111984755 #define FWL_STYLEEXT_TTP_Rectangle (0L << 3) #define FWL_STYLEEXT_TTP_RoundCorner (1L << 3) #define FWL_STYLEEXT_TTP_Balloon (1L << 4) |