From 3e577c2660c89646b56753839c1ec59c3ad187f4 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 10 Nov 2016 11:01:16 -0800 Subject: Convert FWL_SCBCODE to an enum class This Cl changes the enum into an enum class and updates calling code to pass the enum instead of a uint32_t Review-Url: https://codereview.chromium.org/2482253004 --- xfa/fwl/core/ifwl_scrollbar.h | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'xfa/fwl/core/ifwl_scrollbar.h') diff --git a/xfa/fwl/core/ifwl_scrollbar.h b/xfa/fwl/core/ifwl_scrollbar.h index 78164fd50a..c2d74b2c3b 100644 --- a/xfa/fwl/core/ifwl_scrollbar.h +++ b/xfa/fwl/core/ifwl_scrollbar.h @@ -18,19 +18,6 @@ class IFWL_Widget; #define FWL_STYLEEXT_SCB_Horz (0L << 0) #define FWL_STYLEEXT_SCB_Vert (1L << 0) -enum FWL_SCBCODE { - FWL_SCBCODE_None = 1, - FWL_SCBCODE_Min, - FWL_SCBCODE_Max, - FWL_SCBCODE_PageBackward, - FWL_SCBCODE_PageForward, - FWL_SCBCODE_StepBackward, - FWL_SCBCODE_StepForward, - FWL_SCBCODE_Pos, - FWL_SCBCODE_TrackPos, - FWL_SCBCODE_EndScroll, -}; - class IFWL_ScrollBarDP : public IFWL_DataProvider {}; class IFWL_ScrollBar : public IFWL_Widget { @@ -102,7 +89,7 @@ class IFWL_ScrollBar : public IFWL_Widget { FX_FLOAT GetTrackPointPos(FX_FLOAT fx, FX_FLOAT fy); void GetTrackRect(CFX_RectF& rect, bool bLower = true); bool SendEvent(); - bool OnScroll(uint32_t dwCode, FX_FLOAT fPos); + bool OnScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos); 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); @@ -112,7 +99,7 @@ class IFWL_ScrollBar : public IFWL_Widget { uint32_t dwFlags, FX_FLOAT fDeltaX, FX_FLOAT fDeltaY); - bool DoScroll(uint32_t dwCode, FX_FLOAT fPos = 0.0f); + bool DoScroll(FWL_SCBCODE dwCode, FX_FLOAT fPos = 0.0f); void DoMouseDown(int32_t iItem, const CFX_RectF& rtItem, int32_t& iState, -- cgit v1.2.3