diff options
Diffstat (limited to 'xfa/include')
23 files changed, 141 insertions, 141 deletions
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<std::unique_ptr<CFWL_ComboBoxItem>> 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<std::unique_ptr<CFWL_ListItem>> 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, diff --git a/xfa/include/fwl/theme/carettp.h b/xfa/include/fwl/theme/carettp.h index d99f92a5f3..bd432dc401 100644 --- a/xfa/include/fwl/theme/carettp.h +++ b/xfa/include/fwl/theme/carettp.h @@ -18,7 +18,7 @@ class CFWL_CaretTP : public CFWL_WidgetTP { protected: void DrawCaretBK(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* pRect, CFX_Color* crFill, CFX_Matrix* pMatrix = NULL); diff --git a/xfa/include/fwl/theme/checkboxtp.h b/xfa/include/fwl/theme/checkboxtp.h index 4208897db6..fc666d74b5 100644 --- a/xfa/include/fwl/theme/checkboxtp.h +++ b/xfa/include/fwl/theme/checkboxtp.h @@ -15,8 +15,8 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { CFWL_CheckBoxTP(); virtual ~CFWL_CheckBoxTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); @@ -27,12 +27,12 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { void DrawBoxBk(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRect, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix = NULL); void DrawSign(IFWL_Widget* pWidget, CFX_Graphics* pGraphics, const CFX_RectF* pRtBox, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix = NULL); void DrawSignNeutral(CFX_Graphics* pGraphics, const CFX_RectF* pRtSign, @@ -66,7 +66,7 @@ class CFWL_CheckBoxTP : public CFWL_WidgetTP { const CFX_RectF* pRtBox, FX_BOOL bDisable = FALSE, CFX_Matrix* pMatrix = NULL); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); void initCheckPath(FX_FLOAT fCheckLen); struct CKBThemeData { FX_ARGB clrBoxBk[13][2]; diff --git a/xfa/include/fwl/theme/comboboxtp.h b/xfa/include/fwl/theme/comboboxtp.h index 0cf13a4c1d..74d49b45e7 100644 --- a/xfa/include/fwl/theme/comboboxtp.h +++ b/xfa/include/fwl/theme/comboboxtp.h @@ -15,14 +15,14 @@ class CFWL_ComboBoxTP : public CFWL_WidgetTP { virtual ~CFWL_ComboBoxTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); protected: void DrawDropDownButton(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix); void DrawStrethHandler(CFWL_ThemeBackground* pParams, - FX_DWORD dwStates, + uint32_t dwStates, CFX_Matrix* pMatrix); }; diff --git a/xfa/include/fwl/theme/formtp.h b/xfa/include/fwl/theme/formtp.h index d0c885bf66..90ec67387e 100644 --- a/xfa/include/fwl/theme/formtp.h +++ b/xfa/include/fwl/theme/formtp.h @@ -18,12 +18,12 @@ class CFWL_FormTP : public CFWL_WidgetTP { virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); protected: @@ -75,7 +75,7 @@ class CFWL_FormTP : public CFWL_WidgetTP { FWLTHEME_STATE eState, CFX_Matrix* pMatrix, int32_t iActive = 0); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); void TransModeColor(FX_ARGB clrFore, FX_ARGB& clrBack); void DeactiveForm(); void InitCaption(FX_BOOL bActive); diff --git a/xfa/include/fwl/theme/listboxtp.h b/xfa/include/fwl/theme/listboxtp.h index 8b689814ff..8f5720c9fb 100644 --- a/xfa/include/fwl/theme/listboxtp.h +++ b/xfa/include/fwl/theme/listboxtp.h @@ -20,7 +20,7 @@ class CFWL_ListBoxTP : public CFWL_WidgetTP { protected: void DrawListBoxItem(CFX_Graphics* pGraphics, - FX_DWORD dwStates, + uint32_t dwStates, const CFX_RectF* prtItem, void* pData = NULL, CFX_Matrix* pMatrix = NULL); diff --git a/xfa/include/fwl/theme/monthcalendartp.h b/xfa/include/fwl/theme/monthcalendartp.h index cf7f1e70b1..8321965a8b 100644 --- a/xfa/include/fwl/theme/monthcalendartp.h +++ b/xfa/include/fwl/theme/monthcalendartp.h @@ -14,12 +14,12 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP { CFWL_MonthCalendarTP(); virtual ~CFWL_MonthCalendarTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); @@ -33,8 +33,8 @@ class CFWL_MonthCalendarTP : public CFWL_WidgetTP { FX_BOOL DrawTodayCircle(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); FX_BOOL DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); FX_BOOL DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix); - FWLTHEME_STATE GetState(FX_DWORD dwFWLStates); - void SetThemeData(FX_DWORD dwThemeID); + FWLTHEME_STATE GetState(uint32_t dwFWLStates); + void SetThemeData(uint32_t dwThemeID); class MCThemeData { public: FX_ARGB clrCaption; diff --git a/xfa/include/fwl/theme/pushbuttontp.h b/xfa/include/fwl/theme/pushbuttontp.h index 0b8cc4acf2..b951de0bed 100644 --- a/xfa/include/fwl/theme/pushbuttontp.h +++ b/xfa/include/fwl/theme/pushbuttontp.h @@ -14,24 +14,24 @@ class CFWL_PushButtonTP : public CFWL_WidgetTP { CFWL_PushButtonTP(); virtual ~CFWL_PushButtonTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FWL_ERR Initialize(); virtual FWL_ERR Finalize(); protected: - void SetThemeData(FX_DWORD dwID); - void SetTopLineColor(FX_DWORD* pData); - void SetLeftLineColor(FX_DWORD* pData); - void SetRightLineColor(FX_DWORD* pData); - void SetBottomLineColor(FX_DWORD* pData); - void SetBackgroudColor(FX_DWORD* pData); - void SetCaptionColor(FX_DWORD* pData); - void SetCornerColor(FX_DWORD* pData); - int32_t GetColorID(FX_DWORD dwStates); + void SetThemeData(uint32_t dwID); + void SetTopLineColor(uint32_t* pData); + void SetLeftLineColor(uint32_t* pData); + void SetRightLineColor(uint32_t* pData); + void SetBottomLineColor(uint32_t* pData); + void SetBackgroudColor(uint32_t* pData); + void SetCaptionColor(uint32_t* pData); + void SetCornerColor(uint32_t* pData); + int32_t GetColorID(uint32_t dwStates); struct PBThemeData { FX_ARGB clrBorder[5]; diff --git a/xfa/include/fwl/theme/scrollbartp.h b/xfa/include/fwl/theme/scrollbartp.h index 5cfcaea95d..5b7145c155 100644 --- a/xfa/include/fwl/theme/scrollbartp.h +++ b/xfa/include/fwl/theme/scrollbartp.h @@ -14,11 +14,11 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { CFWL_ScrollBarTP(); virtual ~CFWL_ScrollBarTP(); virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); protected: void DrawThumbBtn(CFX_Graphics* pGraphics, @@ -43,7 +43,7 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP { FX_BOOL bVert, FWLTHEME_STATE eState, CFX_Matrix* pMatrix = NULL); - void SetThemeData(FX_DWORD dwID); + void SetThemeData(uint32_t dwID); struct SBThemeData { FX_ARGB clrPawColorLight[4]; FX_ARGB clrPawColorDark[4]; diff --git a/xfa/include/fwl/theme/utils.h b/xfa/include/fwl/theme/utils.h index 73e865076d..0a37d3274b 100644 --- a/xfa/include/fwl/theme/utils.h +++ b/xfa/include/fwl/theme/utils.h @@ -29,7 +29,7 @@ enum FWLTHEME_DIRECTION { }; struct FWLCOLOR { union { - FX_DWORD color; + uint32_t color; struct { uint8_t b; uint8_t g; @@ -39,11 +39,11 @@ struct FWLCOLOR { }; FWLCOLOR() : color(0) {} - FWLCOLOR(FX_DWORD c) : color(c) {} + FWLCOLOR(uint32_t c) : color(c) {} FWLCOLOR(const FWLCOLOR& c) : color(c.color) {} bool operator==(const FWLCOLOR& frColor) { return color == frColor.color; } - operator FX_DWORD() { return color; } + operator uint32_t() { return color; } }; #define FWLTHEME_BEZIER FX_BEZIER #define FWLTHEME_PI FX_PI diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h index 8d3f9ee79a..344f4d3034 100644 --- a/xfa/include/fwl/theme/widgettp.h +++ b/xfa/include/fwl/theme/widgettp.h @@ -32,16 +32,16 @@ class IFX_FontSourceEnum; class CFWL_WidgetTP { public: virtual FX_BOOL IsValidWidget(IFWL_Widget* pWidget); - virtual FX_DWORD GetThemeID(IFWL_Widget* pWidget); - virtual FX_DWORD SetThemeID(IFWL_Widget* pWidget, - FX_DWORD dwThemeID, + virtual uint32_t GetThemeID(IFWL_Widget* pWidget); + virtual uint32_t SetThemeID(IFWL_Widget* pWidget, + uint32_t dwThemeID, FX_BOOL bChildren = TRUE); virtual FWL_ERR GetThemeMatrix(IFWL_Widget* pWidget, CFX_Matrix& matrix); virtual FWL_ERR SetThemeMatrix(IFWL_Widget* pWidget, const CFX_Matrix& matrix); virtual FX_BOOL DrawBackground(CFWL_ThemeBackground* pParams); virtual FX_BOOL DrawText(CFWL_ThemeText* pParams); - virtual void* GetCapacity(CFWL_ThemePart* pThemePart, FX_DWORD dwCapacity); + virtual void* GetCapacity(CFWL_ThemePart* pThemePart, uint32_t dwCapacity); virtual FX_BOOL IsCustomizedLayout(IFWL_Widget* pWidget); virtual FWL_ERR GetPartRect(CFWL_ThemePart* pThemePart, CFX_RectF& rtPart); virtual FX_BOOL IsInPart(CFWL_ThemePart* pThemePart, @@ -66,7 +66,7 @@ class CFWL_WidgetTP { FX_ERR InitTTO(); FX_ERR FinalizeTTO(); void DrawEdge(CFX_Graphics* pGraphics, - FX_DWORD dwStyles, + uint32_t dwStyles, const CFX_RectF* pRect, CFX_Matrix* pMatrix = NULL); void Draw3DRect(CFX_Graphics* pGraphics, @@ -141,20 +141,20 @@ class CFWL_WidgetTP { FWLTHEME_STATE eState, CFX_Matrix* pMatrix = NULL); FWLCOLOR BlendColor(FWLCOLOR srcColor, FWLCOLOR renderColor, uint8_t scale); - FX_DWORD m_dwRefCount; + uint32_t m_dwRefCount; IFDE_TextOut* m_pTextOut; IFX_Font* m_pFDEFont; FX_FLOAT m_fValue; - FX_DWORD m_dwValue; + uint32_t m_dwValue; CFX_RectF m_rtMargin; - FX_DWORD m_dwThemeID; + uint32_t m_dwThemeID; CFX_Matrix _ctm; }; FX_BOOL FWLTHEME_Init(); void FWLTHEME_Release(); -FX_DWORD FWL_GetThemeLayout(FX_DWORD dwThemeID); -FX_DWORD FWL_GetThemeColor(FX_DWORD dwThemeID); -FX_DWORD FWL_MakeThemeID(FX_DWORD dwLayout, FX_DWORD dwColor); +uint32_t FWL_GetThemeLayout(uint32_t dwThemeID); +uint32_t FWL_GetThemeColor(uint32_t dwThemeID); +uint32_t FWL_MakeThemeID(uint32_t dwLayout, uint32_t dwColor); class CFWL_ArrowData { public: @@ -162,7 +162,7 @@ class CFWL_ArrowData { static FX_BOOL IsInstance(); static void DestroyInstance(); virtual ~CFWL_ArrowData(); - void SetColorData(FX_DWORD dwID); + void SetColorData(uint32_t dwID); class CColorData { public: @@ -182,17 +182,17 @@ class CFWL_FontData { CFWL_FontData(); virtual ~CFWL_FontData(); FX_BOOL Equal(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage); FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage); IFX_Font* GetFont() const { return m_pFont; } protected: CFX_WideString m_wsFamily; - FX_DWORD m_dwStyles; - FX_DWORD m_dwCodePage; + uint32_t m_dwStyles; + uint32_t m_dwCodePage; IFX_Font* m_pFont; IFX_FontMgr* m_pFontMgr; #if _FXM_PLATFORM_ != _FXM_PLATFORM_WINDOWS_ @@ -206,7 +206,7 @@ class CFWL_FontManager { static void DestroyInstance(); IFX_Font* FindFont(const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t dwCodePage); protected: diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h index 0015ae443d..c55ddf25f0 100644 --- a/xfa/include/fxfa/fxfa.h +++ b/xfa/include/fxfa/fxfa.h @@ -213,7 +213,7 @@ class IXFA_AppProvider { * @param[in] dwType The system code for the appropriate sound.0 (Error)1 * (Warning)2 (Question)3 (Status)4 (Default) */ - virtual void Beep(FX_DWORD dwType) = 0; + virtual void Beep(uint32_t dwType) = 0; /** * Displays a message box. @@ -224,8 +224,8 @@ class IXFA_AppProvider { */ virtual int32_t MsgBox(const CFX_WideStringC& wsMessage, const CFX_WideStringC& wsTitle = FX_WSTRC(L""), - FX_DWORD dwIconType = 0, - FX_DWORD dwButtonType = 0) = 0; + uint32_t dwIconType = 0, + uint32_t dwButtonType = 0) = 0; /** * Get a response from the user. @@ -295,11 +295,11 @@ class IXFA_FontMgr { virtual IFX_Font* GetFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; virtual IFX_Font* GetDefaultFont(IXFA_Doc* hDoc, const CFX_WideStringC& wsFontFamily, - FX_DWORD dwFontStyles, + uint32_t dwFontStyles, uint16_t wCodePage = 0xFFFF) = 0; }; class IXFA_App { @@ -368,7 +368,7 @@ class IXFA_DocProvider { virtual void SetChangeMark(IXFA_Doc* hDoc) = 0; virtual void InvalidateRect(IXFA_PageView* pPageView, const CFX_RectF& rt, - FX_DWORD dwFlags = 0) = 0; + uint32_t dwFlags = 0) = 0; virtual void DisplayCaret(IXFA_Widget* hWidget, FX_BOOL bVisible, const CFX_RectF* pRtAnchor) = 0; @@ -380,10 +380,10 @@ class IXFA_DocProvider { virtual FX_BOOL PopupMenu(IXFA_Widget* hWidget, CFX_PointF ptPopup, const CFX_RectF* pRectExclude = NULL) = 0; - virtual void PageViewEvent(IXFA_PageView* pPageView, FX_DWORD dwFlags) = 0; + virtual void PageViewEvent(IXFA_PageView* pPageView, uint32_t dwFlags) = 0; virtual void WidgetEvent(IXFA_Widget* hWidget, CXFA_WidgetAcc* pWidgetData, - FX_DWORD dwEvent, + uint32_t dwEvent, void* pParam = NULL, void* pAdditional = NULL) = 0; virtual FX_BOOL RenderCustomWidget(IXFA_Widget* hWidget, @@ -413,7 +413,7 @@ class IXFA_DocProvider { virtual void Print(IXFA_Doc* hDoc, int32_t nStartPage, int32_t nEndPage, - FX_DWORD dwOptions) = 0; + uint32_t dwOptions) = 0; virtual int32_t AbsPageCountInBatch(IXFA_Doc* hDoc) = 0; virtual int32_t AbsPageInBatch(IXFA_Doc* hDoc, IXFA_Widget* hWidget) = 0; virtual int32_t SheetCountInBatch(IXFA_Doc* hDoc) = 0; @@ -478,12 +478,12 @@ class IXFA_DocHandler { virtual void ReleaseDoc(IXFA_Doc* hDoc) = 0; virtual IXFA_DocProvider* GetDocProvider(IXFA_Doc* hDoc) = 0; - virtual FX_DWORD GetDocType(IXFA_Doc* hDoc) = 0; + virtual uint32_t GetDocType(IXFA_Doc* hDoc) = 0; virtual int32_t StartLoad(IXFA_Doc* hDoc) = 0; virtual int32_t DoLoad(IXFA_Doc* hDoc, IFX_Pause* pPause = NULL) = 0; virtual void StopLoad(IXFA_Doc* hDoc) = 0; - virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, FX_DWORD dwView = 0) = 0; + virtual IXFA_DocView* CreateDocView(IXFA_Doc* hDoc, uint32_t dwView = 0) = 0; virtual int32_t CountPackages(IXFA_Doc* hDoc) = 0; virtual void GetPackageName(IXFA_Doc* hDoc, @@ -650,8 +650,8 @@ class IXFA_PageView { virtual void UnloadPageView() = 0; virtual IXFA_Widget* GetWidgetByPos(FX_FLOAT fx, FX_FLOAT fy) = 0; virtual IXFA_WidgetIterator* CreateWidgetIterator( - FX_DWORD dwTraverseWay = XFA_TRAVERSEWAY_Form, - FX_DWORD dwWidgetFilter = XFA_WIDGETFILTER_Visible | + uint32_t dwTraverseWay = XFA_TRAVERSEWAY_Form, + uint32_t dwWidgetFilter = XFA_WIDGETFILTER_Visible | XFA_WIDGETFILTER_Viewable | XFA_WIDGETFILTER_AllType) = 0; }; @@ -717,10 +717,10 @@ class IXFA_WidgetHandler { IXFA_Widget* hBefore = NULL) = 0; virtual IXFA_PageView* GetPageView(IXFA_Widget* hWidget) = 0; virtual void GetRect(IXFA_Widget* hWidget, CFX_RectF& rt) = 0; - virtual FX_DWORD GetStatus(IXFA_Widget* hWidget) = 0; + virtual uint32_t GetStatus(IXFA_Widget* hWidget) = 0; virtual FX_BOOL GetBBox(IXFA_Widget* hWidget, CFX_RectF& rtBox, - FX_DWORD dwStatus, + uint32_t dwStatus, FX_BOOL bDrawFocus = FALSE) = 0; virtual CXFA_WidgetAcc* GetDataAcc(IXFA_Widget* hWidget) = 0; @@ -737,49 +737,49 @@ class IXFA_WidgetHandler { virtual FX_BOOL OnMouseEnter(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnMouseExit(IXFA_Widget* hWidget) = 0; virtual FX_BOOL OnLButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnLButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseMove(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnMouseWheel(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, int16_t zDelta, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDown(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonUp(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnRButtonDblClk(IXFA_Widget* hWidget, - FX_DWORD dwFlags, + uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnKeyDown(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnKeyUp(IXFA_Widget* hWidget, - FX_DWORD dwKeyCode, - FX_DWORD dwFlags) = 0; + uint32_t dwKeyCode, + uint32_t dwFlags) = 0; virtual FX_BOOL OnChar(IXFA_Widget* hWidget, - FX_DWORD dwChar, - FX_DWORD dwFlags) = 0; - virtual FX_DWORD OnHitTest(IXFA_Widget* hWidget, + uint32_t dwChar, + uint32_t dwFlags) = 0; + virtual uint32_t OnHitTest(IXFA_Widget* hWidget, FX_FLOAT fx, FX_FLOAT fy) = 0; virtual FX_BOOL OnSetCursor(IXFA_Widget* hWidget, diff --git a/xfa/include/fxfa/fxfa_basic.h b/xfa/include/fxfa/fxfa_basic.h index 5c0c5db935..ff151d19ab 100644 --- a/xfa/include/fxfa/fxfa_basic.h +++ b/xfa/include/fxfa/fxfa_basic.h @@ -84,11 +84,11 @@ struct XFA_PACKETINFO { const FX_WCHAR* pName; XFA_XDPPACKET eName; const FX_WCHAR* pURI; - FX_DWORD eFlags; + uint32_t eFlags; }; const XFA_PACKETINFO* XFA_GetPacketByName(const CFX_WideStringC& wsName); -const XFA_PACKETINFO* XFA_GetPacketByID(FX_DWORD dwPacket); +const XFA_PACKETINFO* XFA_GetPacketByID(uint32_t dwPacket); const XFA_PACKETINFO* XFA_GetPacketByIndex(XFA_PACKET ePacket); enum XFA_ATTRIBUTEENUM { @@ -923,8 +923,8 @@ struct XFA_ELEMENTINFO { uint32_t uHash; const FX_WCHAR* pName; XFA_ELEMENT eName; - FX_DWORD dwPackets; - FX_DWORD eObjectType; + uint32_t dwPackets; + uint32_t eObjectType; }; int32_t XFA_GetElementCount(); const XFA_ELEMENTINFO* XFA_GetElementByName(const CFX_WideStringC& wsName); @@ -942,7 +942,7 @@ struct XFA_ATTRIBUTEINFO { const FX_WCHAR* pName; XFA_ATTRIBUTE eName; XFA_ATTRIBUTETYPE eType; - FX_DWORD dwPackets; + uint32_t dwPackets; void* pDefValue; }; int32_t XFA_GetAttributeCount(); @@ -952,22 +952,22 @@ FX_BOOL XFA_GetAttributeDefaultValue(void*& pValue, XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, XFA_ATTRIBUTETYPE eType, - FX_DWORD dwPacket); + uint32_t dwPacket); XFA_ATTRIBUTEENUM XFA_GetAttributeDefaultValue_Enum(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CFX_WideStringC XFA_GetAttributeDefaultValue_Cdata(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); FX_BOOL XFA_GetAttributeDefaultValue_Boolean(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); int32_t XFA_GetAttributeDefaultValue_Integer(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); CXFA_Measurement XFA_GetAttributeDefaultValue_Measure(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ELEMENTHIERARCHY { uint16_t wStart; uint16_t wCount; @@ -986,10 +986,10 @@ const uint16_t* XFA_GetElementChildren(XFA_ELEMENT eElement, int32_t& iCount); const uint8_t* XFA_GetElementAttributes(XFA_ELEMENT eElement, int32_t& iCount); const XFA_ELEMENTINFO* XFA_GetChildOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eChild, - FX_DWORD dwPacket); + uint32_t dwPacket); const XFA_ATTRIBUTEINFO* XFA_GetAttributeOfElement(XFA_ELEMENT eElement, XFA_ATTRIBUTE eAttribute, - FX_DWORD dwPacket); + uint32_t dwPacket); #define XFA_PROPERTYFLAG_OneOf 0x01 #define XFA_PROPERTYFLAG_DefaultOneOf 0x02 struct XFA_PROPERTY { @@ -1001,7 +1001,7 @@ const XFA_PROPERTY* XFA_GetElementProperties(XFA_ELEMENT eElement, int32_t& iCount); const XFA_PROPERTY* XFA_GetPropertyOfElement(XFA_ELEMENT eElement, XFA_ELEMENT eProperty, - FX_DWORD dwPacket); + uint32_t dwPacket); struct XFA_ATTRIBUTEENUMINFO { uint32_t uHash; const FX_WCHAR* pName; diff --git a/xfa/include/fxfa/fxfa_objectacc.h b/xfa/include/fxfa/fxfa_objectacc.h index f390566c74..782b62f9d1 100644 --- a/xfa/include/fxfa/fxfa_objectacc.h +++ b/xfa/include/fxfa/fxfa_objectacc.h @@ -333,7 +333,7 @@ class CXFA_Stroke : public CXFA_Data { int32_t GetJoinType() const; FX_BOOL IsInverted() const; FX_FLOAT GetRadius() const; - FX_BOOL SameStyles(CXFA_Stroke stroke, FX_DWORD dwFlags = 0) const; + FX_BOOL SameStyles(CXFA_Stroke stroke, uint32_t dwFlags = 0) const; }; class CXFA_Corner : public CXFA_Stroke { @@ -434,7 +434,7 @@ class CXFA_WidgetData : public CXFA_Data { CXFA_Validate GetValidate(FX_BOOL bModified = FALSE); CXFA_Bind GetBind(FX_BOOL bModified = FALSE); CXFA_Assist GetAssist(FX_BOOL bModified = FALSE); - FX_DWORD GetRelevantStatus(); + uint32_t GetRelevantStatus(); FX_BOOL GetWidth(FX_FLOAT& fWidth); FX_BOOL GetHeight(FX_FLOAT& fHeight); FX_BOOL GetMinWidth(FX_FLOAT& fMinWidth); diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h index 7b9241832c..f1fcffefc4 100644 --- a/xfa/include/fxfa/fxfa_widget.h +++ b/xfa/include/fxfa/fxfa_widget.h @@ -65,7 +65,7 @@ class CXFA_WidgetAcc : public CXFA_WidgetData { void SetImageImage(CFX_DIBitmap* newImage); void SetImageEditImage(CFX_DIBitmap* newImage); void UpdateUIDisplay(CXFA_FFWidget* pExcept = NULL); - void NotifyEvent(FX_DWORD dwEvent, + void NotifyEvent(uint32_t dwEvent, CXFA_FFWidget* pWidget = NULL, void* pParam = NULL, void* pAdditional = NULL); |