From deee3d2ee201d62e7ef41e7d8378d7f52e057a9c Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 25 Mar 2016 14:38:58 -0700 Subject: Remove FX_DWORD from XFA, part 2 Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002 --- xfa/include/fwl/lightwidget/barcode.h | 4 ++-- xfa/include/fwl/lightwidget/caret.h | 4 ++-- xfa/include/fwl/lightwidget/combobox.h | 16 ++++++++-------- xfa/include/fwl/lightwidget/datetimepicker.h | 4 ++-- xfa/include/fwl/lightwidget/edit.h | 2 +- xfa/include/fwl/lightwidget/listbox.h | 14 +++++++------- xfa/include/fwl/lightwidget/scrollbar.h | 2 +- xfa/include/fwl/lightwidget/theme.h | 8 ++++---- xfa/include/fwl/lightwidget/widget.h | 24 ++++++++++++------------ 9 files changed, 39 insertions(+), 39 deletions(-) (limited to 'xfa/include/fwl/lightwidget') diff --git a/xfa/include/fwl/lightwidget/barcode.h b/xfa/include/fwl/lightwidget/barcode.h index 0483de0f4c..2aa05a2a3c 100644 --- a/xfa/include/fwl/lightwidget/barcode.h +++ b/xfa/include/fwl/lightwidget/barcode.h @@ -108,8 +108,8 @@ class CFWL_Barcode : public CFWL_Edit { virtual int32_t GetErrorCorrectionLevel() { return m_nECLevel; } FX_BOOL m_bTruncated; virtual FX_BOOL GetTruncated() { return m_bTruncated; } - FX_DWORD m_dwAttributeMask; - virtual FX_DWORD GetBarcodeAttributeMask() { return m_dwAttributeMask; } + uint32_t m_dwAttributeMask; + virtual uint32_t GetBarcodeAttributeMask() { return m_dwAttributeMask; } public: CFWL_BarcodeDP() : m_dwAttributeMask(0) {} diff --git a/xfa/include/fwl/lightwidget/caret.h b/xfa/include/fwl/lightwidget/caret.h index 9f84950412..0d8817d296 100644 --- a/xfa/include/fwl/lightwidget/caret.h +++ b/xfa/include/fwl/lightwidget/caret.h @@ -16,8 +16,8 @@ class CFWL_Caret : public CFWL_Widget { static CFWL_Caret* Create(); FWL_ERR Initialize(const CFWL_WidgetProperties* pProperties = NULL); FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE); - FWL_ERR GetFrequency(FX_DWORD& elapse); - FWL_ERR SetFrequency(FX_DWORD elapse); + FWL_ERR GetFrequency(uint32_t& elapse); + FWL_ERR SetFrequency(uint32_t elapse); FWL_ERR SetColor(CFX_Color crFill); protected: diff --git a/xfa/include/fwl/lightwidget/combobox.h b/xfa/include/fwl/lightwidget/combobox.h index 4229cc9a6a..c89ddb2b2a 100644 --- a/xfa/include/fwl/lightwidget/combobox.h +++ b/xfa/include/fwl/lightwidget/combobox.h @@ -64,8 +64,8 @@ class CFWL_ComboBox : public CFWL_Widget { FX_BOOL EditDelete(); FX_BOOL EditDeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); - FWL_ERR EditModifyStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR EditModifyStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); CFWL_ComboBox(); virtual ~CFWL_ComboBox(); @@ -86,7 +86,7 @@ class CFWL_ComboBox : public CFWL_Widget { FWL_HLISTITEM hItem, int32_t nIndex); - virtual FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); + virtual uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR GetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, CFX_WideString& wsText); @@ -96,7 +96,7 @@ class CFWL_ComboBox : public CFWL_Widget { virtual void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle); + uint32_t dwStyle); virtual FWL_ERR SetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText); @@ -112,11 +112,11 @@ class CFWL_ComboBox : public CFWL_Widget { virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck); - virtual FX_DWORD GetItemCheckState(IFWL_Widget* pWidget, + virtual uint32_t GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem); virtual FWL_ERR SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState); + uint32_t dwCheckState); virtual FX_FLOAT GetListHeight(IFWL_Widget* pWidget); std::vector> m_ItemArray; @@ -133,10 +133,10 @@ class CFWL_ComboBoxItem { m_pData = NULL; } CFX_RectF m_rtItem; - FX_DWORD m_dwStyles; + uint32_t m_dwStyles; CFX_WideString m_wsText; CFX_DIBitmap* m_pDIB; - FX_DWORD m_dwCheckState; + uint32_t m_dwCheckState; CFX_RectF m_rtCheckBox; void* m_pData; }; diff --git a/xfa/include/fwl/lightwidget/datetimepicker.h b/xfa/include/fwl/lightwidget/datetimepicker.h index 379883fb0b..17ab11ceb2 100644 --- a/xfa/include/fwl/lightwidget/datetimepicker.h +++ b/xfa/include/fwl/lightwidget/datetimepicker.h @@ -36,8 +36,8 @@ class CFWL_DateTimePicker : public CFWL_Widget { FX_BOOL DeSelect(); FWL_ERR GetBBox(CFX_RectF& rect); FWL_ERR SetEditLimit(int32_t nLimit); - FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded, - FX_DWORD dwStylesExRemoved); + FWL_ERR ModifyEditStylesEx(uint32_t dwStylesExAdded, + uint32_t dwStylesExRemoved); protected: CFWL_DateTimePicker(); diff --git a/xfa/include/fwl/lightwidget/edit.h b/xfa/include/fwl/lightwidget/edit.h index 24a04a35eb..a142f483d1 100644 --- a/xfa/include/fwl/lightwidget/edit.h +++ b/xfa/include/fwl/lightwidget/edit.h @@ -45,7 +45,7 @@ class CFWL_Edit : public CFWL_Widget { FX_BOOL Undo(const CFX_ByteStringC& bsRecord); FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant); FWL_ERR SetNumberRange(int32_t iMin, int32_t iMax); - FWL_ERR SetBackColor(FX_DWORD dwColor); + FWL_ERR SetBackColor(uint32_t dwColor); FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize); FX_BOOL CanUndo(); FX_BOOL CanRedo(); diff --git a/xfa/include/fwl/lightwidget/listbox.h b/xfa/include/fwl/lightwidget/listbox.h index 69c7d208c6..6e35de738b 100644 --- a/xfa/include/fwl/lightwidget/listbox.h +++ b/xfa/include/fwl/lightwidget/listbox.h @@ -43,7 +43,7 @@ class CFWL_ListBox : public CFWL_Widget { FWL_ERR SetItemData(FWL_HLISTITEM hItem, void* pData); void* GetItemData(FWL_HLISTITEM hItem); FWL_HLISTITEM GetItemAtPoint(FX_FLOAT fx, FX_FLOAT fy); - FX_DWORD GetItemStates(FWL_HLISTITEM hItem); + uint32_t GetItemStates(FWL_HLISTITEM hItem); CFWL_ListBox(); virtual ~CFWL_ListBox(); @@ -64,7 +64,7 @@ class CFWL_ListBox : public CFWL_Widget { FX_BOOL SetItemIndex(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, int32_t nIndex) override; - FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; + uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR GetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, CFX_WideString& wsText) override; @@ -74,7 +74,7 @@ class CFWL_ListBox : public CFWL_Widget { void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR SetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwStyle) override; + uint32_t dwStyle) override; FWL_ERR SetItemText(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const FX_WCHAR* pszText) override; @@ -90,11 +90,11 @@ class CFWL_ListBox : public CFWL_Widget { FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, const CFX_RectF& rtCheck) override; - FX_DWORD GetItemCheckState(IFWL_Widget* pWidget, + uint32_t GetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) override; FWL_ERR SetItemCheckState(IFWL_Widget* pWidget, FWL_HLISTITEM hItem, - FX_DWORD dwCheckState) override; + uint32_t dwCheckState) override; std::vector> m_ItemArray; CFX_WideString m_wsData; @@ -116,11 +116,11 @@ class CFWL_ListItem { m_rtCheckBox.Reset(); } CFX_RectF m_rtItem; - FX_DWORD m_dwStates; + uint32_t m_dwStates; CFX_WideString m_wsText; CFX_DIBitmap* m_pDIB; void* m_pData; - FX_DWORD m_dwCheckState; + uint32_t m_dwCheckState; CFX_RectF m_rtCheckBox; }; diff --git a/xfa/include/fwl/lightwidget/scrollbar.h b/xfa/include/fwl/lightwidget/scrollbar.h index d78e8bec63..3d35ee651f 100644 --- a/xfa/include/fwl/lightwidget/scrollbar.h +++ b/xfa/include/fwl/lightwidget/scrollbar.h @@ -24,7 +24,7 @@ class CFWL_ScrollBar : public CFWL_Widget { FWL_ERR SetPos(FX_FLOAT fPos); FX_FLOAT GetTrackPos(); FWL_ERR SetTrackPos(FX_FLOAT fTrackPos); - FX_BOOL DoScroll(FX_DWORD dwCode, FX_FLOAT fPos = 0.0f); + FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); CFWL_ScrollBar(); virtual ~CFWL_ScrollBar(); }; diff --git a/xfa/include/fwl/lightwidget/theme.h b/xfa/include/fwl/lightwidget/theme.h index c39b48e307..9e91236ce8 100644 --- a/xfa/include/fwl/lightwidget/theme.h +++ b/xfa/include/fwl/lightwidget/theme.h @@ -27,16 +27,16 @@ class CFWL_Theme : public IFWL_ThemeProvider { // IFWL_ThemeProvider: FX_BOOL IsValidWidget(IFWL_Widget* pWidget) override; - FX_DWORD GetThemeID(IFWL_Widget* pWidget) override; - FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + uint32_t GetThemeID(IFWL_Widget* pWidget) override; + uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE) override; FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix) override; FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, const CFX_Matrix& matrix) override; FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams) override; FX_BOOL DrawText(CFWL_ThemeText* pParams) override; - void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity) override; + void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity) override; FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget) override; FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart) override; FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, diff --git a/xfa/include/fwl/lightwidget/widget.h b/xfa/include/fwl/lightwidget/widget.h index 2f7ea641e9..38fe777fd2 100644 --- a/xfa/include/fwl/lightwidget/widget.h +++ b/xfa/include/fwl/lightwidget/widget.h @@ -34,9 +34,9 @@ class CFWL_WidgetProperties { CFX_WideString m_wsWindowclass; CFX_Matrix m_ctmOnParent; CFX_RectF m_rtWidget; - FX_DWORD m_dwStyles; - FX_DWORD m_dwStyleExes; - FX_DWORD m_dwStates; + uint32_t m_dwStyles; + uint32_t m_dwStyleExes; + uint32_t m_dwStates; CFWL_Widget* m_pParent; CFWL_Widget* m_pOwner; }; @@ -46,7 +46,7 @@ class CFWL_Widget { virtual ~CFWL_Widget(); IFWL_Widget* GetWidget(); FWL_ERR GetClassName(CFX_WideString& wsClass) const; - FX_DWORD GetClassID() const; + uint32_t GetClassID() const; virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const; protected: @@ -61,12 +61,12 @@ class CFWL_Widget { FWL_ERR SetParent(CFWL_Widget* pParent); CFWL_Widget* GetOwner(); FWL_ERR SetOwner(CFWL_Widget* pOwner); - FX_DWORD GetStyles(); - FWL_ERR ModifyStyles(FX_DWORD dwStylesAdded, FX_DWORD dwStylesRemoved); - FX_DWORD GetStylesEx(); - FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded, FX_DWORD dwStylesExRemoved); - FX_DWORD GetStates(); - FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE); + uint32_t GetStyles(); + FWL_ERR ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); + uint32_t GetStylesEx(); + FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved); + uint32_t GetStates(); + FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE); FWL_ERR SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback); @@ -74,7 +74,7 @@ class CFWL_Widget { FWL_ERR Update(); FWL_ERR LockUpdate(); FWL_ERR UnlockUpdate(); - FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy); + uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy); FWL_ERR TransformTo(CFWL_Widget* pWidget, FX_FLOAT& fx, FX_FLOAT& fy); FWL_ERR TransformTo(CFWL_Widget* pWidget, CFX_RectF& rt); FWL_ERR GetMatrix(CFX_Matrix& matrix, FX_BOOL bGlobal = FALSE); @@ -87,7 +87,7 @@ class CFWL_Widget { CFWL_Widget(); void RegisterEventTarget(CFWL_Widget* pEventSource = NULL, - FX_DWORD dwFilter = FWL_EVENT_ALL_MASK); + uint32_t dwFilter = FWL_EVENT_ALL_MASK); void DispatchEvent(CFWL_Event* pEvent); CFX_SizeF CalcTextSize(const CFX_WideString& wsText, FX_BOOL bMultiLine = FALSE, -- cgit v1.2.3