summaryrefslogtreecommitdiff
path: root/xfa/fwl/basewidget
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-03-25 14:38:58 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-25 14:38:58 -0700
commitdeee3d2ee201d62e7ef41e7d8378d7f52e057a9c (patch)
treef9f64d5f24376108a697299f8574ae3a7fe3511b /xfa/fwl/basewidget
parent736f28ab2434e2da1de66ff91b64741483ff9cba (diff)
downloadpdfium-deee3d2ee201d62e7ef41e7d8378d7f52e057a9c.tar.xz
Remove FX_DWORD from XFA, part 2
Some headers were missed in the previous CL. Review URL: https://codereview.chromium.org/1835703002
Diffstat (limited to 'xfa/fwl/basewidget')
-rw-r--r--xfa/fwl/basewidget/fwl_barcodeimp.h4
-rw-r--r--xfa/fwl/basewidget/fwl_caretimp.h8
-rw-r--r--xfa/fwl/basewidget/fwl_checkboximp.h6
-rw-r--r--xfa/fwl/basewidget/fwl_comboboximp.h20
-rw-r--r--xfa/fwl/basewidget/fwl_datetimepickerimp.h10
-rw-r--r--xfa/fwl/basewidget/fwl_editimp.h12
-rw-r--r--xfa/fwl/basewidget/fwl_formproxyimp.h2
-rw-r--r--xfa/fwl/basewidget/fwl_listboximp.h10
-rw-r--r--xfa/fwl/basewidget/fwl_monthcalendarimp.h6
-rw-r--r--xfa/fwl/basewidget/fwl_pictureboximp.h2
-rw-r--r--xfa/fwl/basewidget/fwl_pushbuttonimp.h8
-rw-r--r--xfa/fwl/basewidget/fwl_scrollbarimp.h14
-rw-r--r--xfa/fwl/basewidget/fwl_spinbuttonimp.h8
-rw-r--r--xfa/fwl/basewidget/fwl_tooltipctrlimp.h6
-rw-r--r--xfa/fwl/basewidget/ifwl_barcode.h2
-rw-r--r--xfa/fwl/basewidget/ifwl_caret.h4
-rw-r--r--xfa/fwl/basewidget/ifwl_combobox.h4
-rw-r--r--xfa/fwl/basewidget/ifwl_datetimepicker.h4
-rw-r--r--xfa/fwl/basewidget/ifwl_edit.h2
-rw-r--r--xfa/fwl/basewidget/ifwl_listbox.h8
-rw-r--r--xfa/fwl/basewidget/ifwl_scrollbar.h2
21 files changed, 71 insertions, 71 deletions
diff --git a/xfa/fwl/basewidget/fwl_barcodeimp.h b/xfa/fwl/basewidget/fwl_barcodeimp.h
index 2f12782c69..77b3552a63 100644
--- a/xfa/fwl/basewidget/fwl_barcodeimp.h
+++ b/xfa/fwl/basewidget/fwl_barcodeimp.h
@@ -25,7 +25,7 @@ class CFWL_BarcodeImp : public CFWL_EditImp {
IFWL_Widget* pOuter);
virtual ~CFWL_BarcodeImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR Update();
@@ -40,7 +40,7 @@ class CFWL_BarcodeImp : public CFWL_EditImp {
void CreateBarcodeEngine();
void ReleaseBarcodeEngine();
IFX_Barcode* m_pBarcodeEngine;
- FX_DWORD m_dwStatus;
+ uint32_t m_dwStatus;
BC_TYPE m_type;
friend class CFWL_BarcodeImpDelegate;
};
diff --git a/xfa/fwl/basewidget/fwl_caretimp.h b/xfa/fwl/basewidget/fwl_caretimp.h
index c4b6015c01..47c3a1a7f5 100644
--- a/xfa/fwl/basewidget/fwl_caretimp.h
+++ b/xfa/fwl/basewidget/fwl_caretimp.h
@@ -22,7 +22,7 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
virtual ~CFWL_CaretImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
@@ -31,8 +31,8 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
const CFX_Matrix* pMatrix = NULL);
virtual FWL_ERR ShowCaret(FX_BOOL bFlag = TRUE);
- virtual FWL_ERR GetFrequency(FX_DWORD& elapse);
- virtual FWL_ERR SetFrequency(FX_DWORD elapse);
+ virtual FWL_ERR GetFrequency(uint32_t& elapse);
+ virtual FWL_ERR SetFrequency(uint32_t elapse);
virtual FWL_ERR SetColor(CFX_Color crFill);
protected:
@@ -48,7 +48,7 @@ class CFWL_CaretImp : public CFWL_WidgetImp {
};
CFWL_CaretTimer* m_pTimer;
FWL_HTIMER m_hTimer;
- FX_DWORD m_dwElapse;
+ uint32_t m_dwElapse;
CFX_Color m_crFill;
FX_BOOL m_bSetColor;
friend class CFWL_CaretImpDelegate;
diff --git a/xfa/fwl/basewidget/fwl_checkboximp.h b/xfa/fwl/basewidget/fwl_checkboximp.h
index b5d0d153a7..fe0ebb05cb 100644
--- a/xfa/fwl/basewidget/fwl_checkboximp.h
+++ b/xfa/fwl/basewidget/fwl_checkboximp.h
@@ -20,7 +20,7 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
~CFWL_CheckBoxImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
@@ -32,14 +32,14 @@ class CFWL_CheckBoxImp : public CFWL_WidgetImp {
protected:
void Layout();
- FX_DWORD GetPartStates();
+ uint32_t GetPartStates();
void UpdateTextOutStyles();
void NextStates();
CFX_RectF m_rtClient;
CFX_RectF m_rtBox;
CFX_RectF m_rtCaption;
CFX_RectF m_rtFocus;
- FX_DWORD m_dwTTOStyles;
+ uint32_t m_dwTTOStyles;
int32_t m_iTTOAlign;
FX_BOOL m_bBtnDown;
friend class CFWL_CheckBoxImpDelegate;
diff --git a/xfa/fwl/basewidget/fwl_comboboximp.h b/xfa/fwl/basewidget/fwl_comboboximp.h
index 74f6c6354d..262db35082 100644
--- a/xfa/fwl/basewidget/fwl_comboboximp.h
+++ b/xfa/fwl/basewidget/fwl_comboboximp.h
@@ -85,15 +85,15 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
virtual ~CFWL_ComboBoxImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
- virtual FWL_ERR ModifyStylesEx(FX_DWORD dwStylesExAdded,
- FX_DWORD dwStylesExRemoved);
- virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);
+ virtual FWL_ERR ModifyStylesEx(uint32_t dwStylesExAdded,
+ uint32_t dwStylesExRemoved);
+ virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
virtual FWL_ERR Update();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
@@ -128,8 +128,8 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp {
virtual FX_BOOL EditDelete();
virtual FX_BOOL EditDeSelect();
virtual FWL_ERR GetBBox(CFX_RectF& rect);
- virtual FWL_ERR EditModifyStylesEx(FX_DWORD dwStylesExAdded,
- FX_DWORD dwStylesExRemoved);
+ virtual FWL_ERR EditModifyStylesEx(uint32_t dwStylesExAdded,
+ uint32_t dwStylesExRemoved);
protected:
void DrawStretchHandler(CFX_Graphics* pGraphics, const CFX_Matrix* pMatrix);
@@ -150,10 +150,10 @@ class CFWL_ComboBoxImp : public CFWL_WidgetImp {
void DisForm_InitComboEdit();
void DisForm_ShowDropList(FX_BOOL bActivate);
FX_BOOL DisForm_IsDropListShowed();
- FWL_ERR DisForm_ModifyStylesEx(FX_DWORD dwStylesExAdded,
- FX_DWORD dwStylesExRemoved);
+ FWL_ERR DisForm_ModifyStylesEx(uint32_t dwStylesExAdded,
+ uint32_t dwStylesExRemoved);
FWL_ERR DisForm_Update();
- FX_DWORD DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ uint32_t DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
FWL_ERR DisForm_DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
FWL_ERR DisForm_GetBBox(CFX_RectF& rect);
diff --git a/xfa/fwl/basewidget/fwl_datetimepickerimp.h b/xfa/fwl/basewidget/fwl_datetimepickerimp.h
index 9a4b920aed..68e85050e4 100644
--- a/xfa/fwl/basewidget/fwl_datetimepickerimp.h
+++ b/xfa/fwl/basewidget/fwl_datetimepickerimp.h
@@ -108,12 +108,12 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
virtual ~CFWL_DateTimePickerImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR Update();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pTP);
@@ -140,8 +140,8 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp {
virtual FX_BOOL DeSelect();
virtual FWL_ERR GetBBox(CFX_RectF& rect);
virtual FWL_ERR SetEditLimit(int32_t nLimit);
- virtual FWL_ERR ModifyEditStylesEx(FX_DWORD dwStylesExAdded,
- FX_DWORD dwStylesExRemoved);
+ virtual FWL_ERR ModifyEditStylesEx(uint32_t dwStylesExAdded,
+ uint32_t dwStylesExRemoved);
public:
IFWL_DateTimeEdit* GetDataTimeEdit();
@@ -166,7 +166,7 @@ class CFWL_DateTimePickerImp : public CFWL_WidgetImp {
void DisForm_InitDateTimeEdit();
FX_BOOL DisForm_IsMonthCalendarShowed();
void DisForm_ShowMonthCalendar(FX_BOOL bActivate);
- FX_DWORD DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ uint32_t DisForm_HitTest(FX_FLOAT fx, FX_FLOAT fy);
FX_BOOL DisForm_IsNeedShowButton();
FWL_ERR DisForm_Update();
FWL_ERR DisForm_GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
diff --git a/xfa/fwl/basewidget/fwl_editimp.h b/xfa/fwl/basewidget/fwl_editimp.h
index 3dcf48e1ae..f8fb1aa37d 100644
--- a/xfa/fwl/basewidget/fwl_editimp.h
+++ b/xfa/fwl/basewidget/fwl_editimp.h
@@ -31,14 +31,14 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink {
// CFWL_WidgetImp:
FWL_ERR GetClassName(CFX_WideString& wsClass) const override;
- FX_DWORD GetClassID() const override;
+ uint32_t GetClassID() const override;
FWL_ERR Initialize() override;
FWL_ERR Finalize() override;
FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
FWL_ERR SetWidgetRect(const CFX_RectF& rect) override;
FWL_ERR Update() override;
- FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy) override;
- FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE) override;
+ uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy) override;
+ FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE) override;
FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL) override;
FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider) override;
@@ -109,7 +109,7 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink {
CFX_WideString& wsBlockText) override;
FX_BOOL On_Validate(IFDE_TxtEdtEngine* pEdit,
CFX_WideString& wsText) override;
- virtual FWL_ERR SetBackgroundColor(FX_DWORD color);
+ virtual FWL_ERR SetBackgroundColor(uint32_t color);
virtual FWL_ERR SetFont(const CFX_WideString& wsFont, FX_FLOAT fSize);
void SetScrollOffset(FX_FLOAT fScrollOffset);
FX_BOOL GetSuggestWords(CFX_PointF pointf,
@@ -177,7 +177,7 @@ class CFWL_EditImp : public CFWL_WidgetImp, public IFDE_TxtEdtEventSink {
CFX_WideString m_wsCache;
friend class CFWL_TxtEdtEventSink;
friend class CFWL_EditImpDelegate;
- FX_DWORD m_backColor;
+ uint32_t m_backColor;
FX_BOOL m_updateBackColor;
CFX_WideString m_wsFont;
CFX_ByteStringArray m_RecordArr;
@@ -204,7 +204,7 @@ class CFWL_EditImpDelegate : public CFWL_WidgetImpDelegate {
void OnMouseMove(CFWL_MsgMouse* pMsg);
void OnKeyDown(CFWL_MsgKey* pMsg);
void OnChar(CFWL_MsgKey* pMsg);
- FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, FX_DWORD dwCode, FX_FLOAT fPos);
+ FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, uint32_t dwCode, FX_FLOAT fPos);
void DoCursor(CFWL_MsgMouse* pMsg);
CFWL_EditImp* m_pOwner;
};
diff --git a/xfa/fwl/basewidget/fwl_formproxyimp.h b/xfa/fwl/basewidget/fwl_formproxyimp.h
index c26f21a0d1..4e5e807507 100644
--- a/xfa/fwl/basewidget/fwl_formproxyimp.h
+++ b/xfa/fwl/basewidget/fwl_formproxyimp.h
@@ -19,7 +19,7 @@ class CFWL_FormProxyImp : public CFWL_FormImp {
IFWL_Widget* pOuter);
~CFWL_FormProxyImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
diff --git a/xfa/fwl/basewidget/fwl_listboximp.h b/xfa/fwl/basewidget/fwl_listboximp.h
index a4f9188b4d..1dd0db1b4c 100644
--- a/xfa/fwl/basewidget/fwl_listboximp.h
+++ b/xfa/fwl/basewidget/fwl_listboximp.h
@@ -26,12 +26,12 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
~CFWL_ListBoxImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR Update();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
virtual FWL_ERR SetThemeProvider(IFWL_ThemeProvider* pThemeProvider);
@@ -44,7 +44,7 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp {
virtual FWL_ERR* Sort(IFWL_ListBoxCompare* pCom);
protected:
- FWL_HLISTITEM GetItem(FWL_HLISTITEM hItem, FX_DWORD dwKeyCode);
+ FWL_HLISTITEM GetItem(FWL_HLISTITEM hItem, uint32_t dwKeyCode);
void SetSelection(FWL_HLISTITEM hStart,
FWL_HLISTITEM hEnd,
FX_BOOL bSelected);
@@ -92,7 +92,7 @@ class CFWL_ListBoxImp : public CFWL_WidgetImp {
CFX_RectF m_rtConent;
std::unique_ptr<IFWL_ScrollBar> m_pHorzScrollBar;
std::unique_ptr<IFWL_ScrollBar> m_pVertScrollBar;
- FX_DWORD m_dwTTOStyles;
+ uint32_t m_dwTTOStyles;
int32_t m_iTTOAligns;
FWL_HLISTITEM m_hAnchor;
FX_FLOAT m_fItemHeight;
@@ -116,7 +116,7 @@ class CFWL_ListBoxImpDelegate : public CFWL_WidgetImpDelegate {
void OnMouseWheel(CFWL_MsgMouseWheel* pMsg);
void OnKeyDown(CFWL_MsgKey* pMsg);
void OnVK(FWL_HLISTITEM hItem, FX_BOOL bShift, FX_BOOL bCtrl);
- FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, FX_DWORD dwCode, FX_FLOAT fPos);
+ FX_BOOL OnScroll(IFWL_ScrollBar* pScrollBar, uint32_t dwCode, FX_FLOAT fPos);
void DispatchSelChangedEv();
CFWL_ListBoxImp* m_pOwner;
};
diff --git a/xfa/fwl/basewidget/fwl_monthcalendarimp.h b/xfa/fwl/basewidget/fwl_monthcalendarimp.h
index f1c12b5302..c67848fd1d 100644
--- a/xfa/fwl/basewidget/fwl_monthcalendarimp.h
+++ b/xfa/fwl/basewidget/fwl_monthcalendarimp.h
@@ -23,7 +23,7 @@ class CFWL_MonthCalendarImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
~CFWL_MonthCalendarImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
@@ -209,7 +209,7 @@ class CFWL_MonthCalendarImp : public CFWL_WidgetImp {
struct FWL_DATEINFO {
FWL_DATEINFO(int32_t day,
int32_t dayofweek,
- FX_DWORD dwSt,
+ uint32_t dwSt,
CFX_RectF rc,
CFX_WideString& wsday)
: iDay(day),
@@ -219,7 +219,7 @@ struct FWL_DATEINFO {
wsDay(wsday) {}
int32_t iDay;
int32_t iDayOfWeek;
- FX_DWORD dwStates;
+ uint32_t dwStates;
CFX_RectF rect;
CFX_WideString wsDay;
};
diff --git a/xfa/fwl/basewidget/fwl_pictureboximp.h b/xfa/fwl/basewidget/fwl_pictureboximp.h
index c848e980af..f2e67124f6 100644
--- a/xfa/fwl/basewidget/fwl_pictureboximp.h
+++ b/xfa/fwl/basewidget/fwl_pictureboximp.h
@@ -19,7 +19,7 @@ class CFWL_PictureBoxImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
~CFWL_PictureBoxImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.h b/xfa/fwl/basewidget/fwl_pushbuttonimp.h
index 8c0d5f3395..be6941249c 100644
--- a/xfa/fwl/basewidget/fwl_pushbuttonimp.h
+++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.h
@@ -20,11 +20,11 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp {
IFWL_Widget* pOuter);
virtual ~CFWL_PushButtonImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
- virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet = TRUE);
+ virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet = TRUE);
virtual FWL_ERR Update();
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
@@ -36,12 +36,12 @@ class CFWL_PushButtonImp : public CFWL_WidgetImp {
void DrawText(CFX_Graphics* pGraphics,
IFWL_ThemeProvider* pTheme,
const CFX_Matrix* pMatrix);
- FX_DWORD GetPartStates();
+ uint32_t GetPartStates();
void UpdateTextOutStyles();
CFX_RectF m_rtClient;
CFX_RectF m_rtCaption;
FX_BOOL m_bBtnDown;
- FX_DWORD m_dwTTOStyles;
+ uint32_t m_dwTTOStyles;
int32_t m_iTTOAlign;
friend class CFWL_PushButtonImpDelegate;
};
diff --git a/xfa/fwl/basewidget/fwl_scrollbarimp.h b/xfa/fwl/basewidget/fwl_scrollbarimp.h
index a06e47aada..08f7c69bf7 100644
--- a/xfa/fwl/basewidget/fwl_scrollbarimp.h
+++ b/xfa/fwl/basewidget/fwl_scrollbarimp.h
@@ -20,7 +20,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
IFWL_Widget* pOuter);
~CFWL_ScrollBarImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
@@ -38,7 +38,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
virtual FWL_ERR SetPos(FX_FLOAT fPos);
virtual FX_FLOAT GetTrackPos();
virtual FWL_ERR SetTrackPos(FX_FLOAT fTrackPos);
- virtual FX_BOOL DoScroll(FX_DWORD dwCode, FX_FLOAT fPos = 0.0f);
+ virtual FX_BOOL DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f);
virtual FWL_ERR SetOuter(IFWL_Widget* pOuter);
virtual int32_t Run(FWL_HTIMER hTimer);
@@ -64,7 +64,7 @@ class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy);
void GetTrackRect(CFX_RectF& rect, FX_BOOL bLower = TRUE);
FX_BOOL SendEvent();
- FX_BOOL OnScroll(FX_DWORD dwCode, FX_FLOAT fPos);
+ FX_BOOL OnScroll(uint32_t dwCode, FX_FLOAT fPos);
FWL_HTIMER m_hTimer;
FX_FLOAT m_fRangeMin;
@@ -106,13 +106,13 @@ class CFWL_ScrollBarImpDelegate : public CFWL_WidgetImpDelegate {
const CFX_Matrix* pMatrix = NULL) override;
protected:
- void OnLButtonDown(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- void OnLButtonUp(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
- void OnMouseMove(FX_DWORD dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ void OnLButtonDown(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ void OnLButtonUp(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
+ void OnMouseMove(uint32_t dwFlags, FX_FLOAT fx, FX_FLOAT fy);
void OnMouseLeave();
void OnMouseWheel(FX_FLOAT fx,
FX_FLOAT fy,
- FX_DWORD dwFlags,
+ uint32_t dwFlags,
FX_FLOAT fDeltaX,
FX_FLOAT fDeltaY);
void DoMouseDown(int32_t iItem,
diff --git a/xfa/fwl/basewidget/fwl_spinbuttonimp.h b/xfa/fwl/basewidget/fwl_spinbuttonimp.h
index 7f04ae5c1c..71e2a6dd61 100644
--- a/xfa/fwl/basewidget/fwl_spinbuttonimp.h
+++ b/xfa/fwl/basewidget/fwl_spinbuttonimp.h
@@ -21,12 +21,12 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
IFWL_Widget* pOuter);
~CFWL_SpinButtonImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR Update();
- virtual FX_DWORD HitTest(FX_FLOAT fx, FX_FLOAT fy);
+ virtual uint32_t HitTest(FX_FLOAT fx, FX_FLOAT fy);
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
virtual int32_t Run(FWL_HTIMER hTimer);
@@ -43,8 +43,8 @@ class CFWL_SpinButtonImp : public CFWL_WidgetImp, public IFWL_Timer {
CFX_RectF m_rtClient;
CFX_RectF m_rtUpButton;
CFX_RectF m_rtDnButton;
- FX_DWORD m_dwUpState;
- FX_DWORD m_dwDnState;
+ uint32_t m_dwUpState;
+ uint32_t m_dwDnState;
int32_t m_iButtonIndex;
FX_BOOL m_bLButtonDwn;
FWL_HTIMER m_hTimer;
diff --git a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h
index 121f302572..119c3e1159 100644
--- a/xfa/fwl/basewidget/fwl_tooltipctrlimp.h
+++ b/xfa/fwl/basewidget/fwl_tooltipctrlimp.h
@@ -21,14 +21,14 @@ class CFWL_ToolTipImp : public CFWL_FormImp {
IFWL_Widget* pOuter);
virtual ~CFWL_ToolTipImp();
virtual FWL_ERR GetClassName(CFX_WideString& wsClass) const;
- virtual FX_DWORD GetClassID() const;
+ virtual uint32_t GetClassID() const;
virtual FWL_ERR Initialize();
virtual FWL_ERR Finalize();
virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
virtual FWL_ERR Update();
virtual FWL_ERR DrawWidget(CFX_Graphics* pGraphics,
const CFX_Matrix* pMatrix = NULL);
- virtual FWL_ERR SetStates(FX_DWORD dwStates, FX_BOOL bSet);
+ virtual FWL_ERR SetStates(uint32_t dwStates, FX_BOOL bSet);
virtual FWL_ERR GetClientRect(CFX_RectF& rect);
FWL_ERR SetAnchor(const CFX_RectF& rtAnchor);
FWL_ERR Show();
@@ -54,7 +54,7 @@ class CFWL_ToolTipImp : public CFWL_FormImp {
CFX_RectF m_rtClient;
CFX_RectF m_rtCaption;
FX_BOOL m_bBtnDown;
- FX_DWORD m_dwTTOStyles;
+ uint32_t m_dwTTOStyles;
int32_t m_iTTOAlign;
CFX_RectF m_rtAnchor;
FWL_HTIMER m_hTimerShow;
diff --git a/xfa/fwl/basewidget/ifwl_barcode.h b/xfa/fwl/basewidget/ifwl_barcode.h
index 250e608da7..0dbdcb03c1 100644
--- a/xfa/fwl/basewidget/ifwl_barcode.h
+++ b/xfa/fwl/basewidget/ifwl_barcode.h
@@ -47,7 +47,7 @@ class IFWL_BarcodeDP : public IFWL_EditDP {
virtual int32_t GetVersion() = 0;
virtual int32_t GetErrorCorrectionLevel() = 0;
virtual FX_BOOL GetTruncated() = 0;
- virtual FX_DWORD GetBarcodeAttributeMask() = 0;
+ virtual uint32_t GetBarcodeAttributeMask() = 0;
};
class IFWL_Barcode : public IFWL_Edit {
diff --git a/xfa/fwl/basewidget/ifwl_caret.h b/xfa/fwl/basewidget/ifwl_caret.h
index 5b0138f6ce..229bf12198 100644
--- a/xfa/fwl/basewidget/ifwl_caret.h
+++ b/xfa/fwl/basewidget/ifwl_caret.h
@@ -22,8 +22,8 @@ class IFWL_Caret : public IFWL_Widget {
IFWL_Widget* pOuter);
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/fwl/basewidget/ifwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h
index 93efe287b2..98a6750278 100644
--- a/xfa/fwl/basewidget/ifwl_combobox.h
+++ b/xfa/fwl/basewidget/ifwl_combobox.h
@@ -142,8 +142,8 @@ class IFWL_ComboBox : public IFWL_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);
protected:
IFWL_ComboBox();
diff --git a/xfa/fwl/basewidget/ifwl_datetimepicker.h b/xfa/fwl/basewidget/ifwl_datetimepicker.h
index 25c69682a9..f2a91aba64 100644
--- a/xfa/fwl/basewidget/ifwl_datetimepicker.h
+++ b/xfa/fwl/basewidget/ifwl_datetimepicker.h
@@ -105,8 +105,8 @@ class IFWL_DateTimePicker : public IFWL_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:
IFWL_DateTimePicker();
diff --git a/xfa/fwl/basewidget/ifwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h
index 74b66e8779..f77714122d 100644
--- a/xfa/fwl/basewidget/ifwl_edit.h
+++ b/xfa/fwl/basewidget/ifwl_edit.h
@@ -163,7 +163,7 @@ class IFWL_Edit : public IFWL_Widget {
FWL_ERR SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant);
FWL_ERR SetOuter(IFWL_Widget* pOuter);
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);
void SetScrollOffset(FX_FLOAT fScrollOffset);
FX_BOOL GetSuggestWords(CFX_PointF pointf,
diff --git a/xfa/fwl/basewidget/ifwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h
index 7bec4edd18..1225eafcba 100644
--- a/xfa/fwl/basewidget/ifwl_listbox.h
+++ b/xfa/fwl/basewidget/ifwl_listbox.h
@@ -80,7 +80,7 @@ class IFWL_ListBoxDP : public IFWL_DataProvider {
virtual FX_BOOL SetItemIndex(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
int32_t nIndex) = 0;
- virtual FX_DWORD GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0;
+ virtual uint32_t GetItemStyles(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR GetItemText(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
CFX_WideString& wsText) = 0;
@@ -90,7 +90,7 @@ class IFWL_ListBoxDP : public IFWL_DataProvider {
virtual void* GetItemData(IFWL_Widget* pWidget, FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR SetItemStyles(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
- FX_DWORD dwStyle) = 0;
+ uint32_t dwStyle) = 0;
virtual FWL_ERR SetItemText(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
const FX_WCHAR* pszText) = 0;
@@ -106,11 +106,11 @@ class IFWL_ListBoxDP : public IFWL_DataProvider {
virtual FWL_ERR SetItemCheckRect(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
const CFX_RectF& rtCheck) = 0;
- virtual FX_DWORD GetItemCheckState(IFWL_Widget* pWidget,
+ virtual uint32_t GetItemCheckState(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem) = 0;
virtual FWL_ERR SetItemCheckState(IFWL_Widget* pWidget,
FWL_HLISTITEM hItem,
- FX_DWORD dwCheckState) = 0;
+ uint32_t dwCheckState) = 0;
};
class IFWL_ListBoxCompare {
diff --git a/xfa/fwl/basewidget/ifwl_scrollbar.h b/xfa/fwl/basewidget/ifwl_scrollbar.h
index c481332132..a5b17eab90 100644
--- a/xfa/fwl/basewidget/ifwl_scrollbar.h
+++ b/xfa/fwl/basewidget/ifwl_scrollbar.h
@@ -68,7 +68,7 @@ class IFWL_ScrollBar : public IFWL_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);
protected:
IFWL_ScrollBar();