From e35af1e3c93e5e1f374799da115eb4b99820831c Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 13 Jul 2016 11:26:20 -0700 Subject: Remove some IFX_* wrappers. This CL removes the IFX_* wrappers between fpdfsdk/fxedit and fpdfsdk/pdfwindow which only have a single implementation. Review-Url: https://codereview.chromium.org/2142213002 --- fpdfsdk/pdfwindow/PWL_ListBox.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) (limited to 'fpdfsdk/pdfwindow/PWL_ListBox.h') diff --git a/fpdfsdk/pdfwindow/PWL_ListBox.h b/fpdfsdk/pdfwindow/PWL_ListBox.h index eea0862a8b..91ab7f768f 100644 --- a/fpdfsdk/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/pdfwindow/PWL_ListBox.h @@ -10,31 +10,27 @@ #include "fpdfsdk/fxedit/include/fx_edit.h" #include "fpdfsdk/pdfwindow/PWL_Wnd.h" +class CFX_ListCtrl; class CPWL_List_Notify; class CPWL_ListBox; class IPWL_Filler_Notify; +struct CPVT_SecProps; +struct CPVT_WordPlace; +struct CPVT_WordProps; -class CPWL_List_Notify : public IFX_List_Notify { +class CPWL_List_Notify { public: CPWL_List_Notify(CPWL_ListBox* pList); - ~CPWL_List_Notify() override; + ~CPWL_List_Notify(); - // IFX_List_Notify - void IOnSetScrollInfoX(FX_FLOAT fPlateMin, - FX_FLOAT fPlateMax, - FX_FLOAT fContentMin, - FX_FLOAT fContentMax, - FX_FLOAT fSmallStep, - FX_FLOAT fBigStep) override {} void IOnSetScrollInfoY(FX_FLOAT fPlateMin, FX_FLOAT fPlateMax, FX_FLOAT fContentMin, FX_FLOAT fContentMax, FX_FLOAT fSmallStep, - FX_FLOAT fBigStep) override; - void IOnSetScrollPosX(FX_FLOAT fx) override {} - void IOnSetScrollPosY(FX_FLOAT fy) override; - void IOnInvalidateRect(CFX_FloatRect* pRect) override; + FX_FLOAT fBigStep); + void IOnSetScrollPosY(FX_FLOAT fy); + void IOnInvalidateRect(CFX_FloatRect* pRect); void IOnSetCaret(FX_BOOL bVisible, const CFX_FloatPoint& ptHead, @@ -104,8 +100,8 @@ class CPWL_ListBox : public CPWL_Wnd { } protected: - IFX_List* m_pList; - CPWL_List_Notify* m_pListNotify; + std::unique_ptr m_pList; + std::unique_ptr m_pListNotify; FX_BOOL m_bMouseDown; FX_BOOL m_bHoverSel; IPWL_Filler_Notify* m_pFillerNotify; -- cgit v1.2.3