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/fwl/basewidget/fwl_listboximp.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa/fwl/basewidget/fwl_listboximp.h') 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 m_pHorzScrollBar; std::unique_ptr 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; }; -- cgit v1.2.3