From 72177dadac8f9765440b3aa01e2668f60a8b3f43 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 15 Sep 2016 12:07:23 -0700 Subject: Replace FX_UINT with unsigned int Remove the FX_UINT typedef and update to use the actual unsigned int type. Review-Url: https://codereview.chromium.org/2343693002 --- fpdfsdk/formfiller/cffl_formfiller.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'fpdfsdk/formfiller/cffl_formfiller.h') diff --git a/fpdfsdk/formfiller/cffl_formfiller.h b/fpdfsdk/formfiller/cffl_formfiller.h index 6a41185c39..9d2b66b769 100644 --- a/fpdfsdk/formfiller/cffl_formfiller.h +++ b/fpdfsdk/formfiller/cffl_formfiller.h @@ -43,41 +43,43 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { virtual FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnLButtonDblClk(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnMouseWheel(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, short zDelta, const CFX_FloatPoint& point); virtual FX_BOOL OnRButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnRButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point); virtual FX_BOOL OnKeyDown(CPDFSDK_Annot* pAnnot, - FX_UINT nKeyCode, - FX_UINT nFlags); - virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, FX_UINT nChar, FX_UINT nFlags); + uint32_t nKeyCode, + uint32_t nFlags); + virtual FX_BOOL OnChar(CPDFSDK_Annot* pAnnot, + uint32_t nChar, + uint32_t nFlags); - void SetFocusForAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); - void KillFocusForAnnot(CPDFSDK_Annot* pAnnot, FX_UINT nFlag); + void SetFocusForAnnot(CPDFSDK_Annot* pAnnot, uint32_t nFlag); + void KillFocusForAnnot(CPDFSDK_Annot* pAnnot, uint32_t nFlag); // CPWL_TimerHandler void TimerProc() override; @@ -119,7 +121,7 @@ class CFFL_FormFiller : public IPWL_Provider, public CPWL_TimerHandler { const CFX_FloatRect& rcWindow); CFX_FloatRect GetWindowRect(CPDFSDK_PageView* pPageView); - FX_BOOL CommitData(CPDFSDK_PageView* pPageView, FX_UINT nFlag); + FX_BOOL CommitData(CPDFSDK_PageView* pPageView, uint32_t nFlag); virtual FX_BOOL IsDataChanged(CPDFSDK_PageView* pPageView); virtual void SaveData(CPDFSDK_PageView* pPageView); @@ -180,15 +182,15 @@ class CFFL_Button : public CFFL_FormFiller { void OnMouseExit(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot) override; FX_BOOL OnLButtonDown(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnLButtonUp(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; FX_BOOL OnMouseMove(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, - FX_UINT nFlags, + uint32_t nFlags, const CFX_FloatPoint& point) override; void OnDraw(CPDFSDK_PageView* pPageView, CPDFSDK_Annot* pAnnot, -- cgit v1.2.3