From 6fe32f898af3eea875fd01a6d18f719d17dd72f3 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 25 Oct 2018 23:25:58 +0000 Subject: Make CPWL_Wnd own its pAttachedData. This requires moving it out of CreateParams, since that must be a copyable struct, and implies that currently there is some questionable sharing going on. To resolve this, introduce a Clone() method so that each window gets its own copy. Make GetAttachedData() return a const pointer, so that callers can't free it behind our back. Tidy initializations along the way. Change-Id: Iadc97688b4692bf4fafefe8cff88af88672f7110 Reviewed-on: https://pdfium-review.googlesource.com/c/44590 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- fpdfsdk/pwl/cpwl_list_box.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fpdfsdk/pwl/cpwl_list_box.h') diff --git a/fpdfsdk/pwl/cpwl_list_box.h b/fpdfsdk/pwl/cpwl_list_box.h index 6a58982aee..cbfca4585f 100644 --- a/fpdfsdk/pwl/cpwl_list_box.h +++ b/fpdfsdk/pwl/cpwl_list_box.h @@ -38,7 +38,7 @@ class CPWL_List_Notify { class CPWL_ListBox : public CPWL_Wnd { public: - CPWL_ListBox(); + explicit CPWL_ListBox(std::unique_ptr pAttachedData); ~CPWL_ListBox() override; // CPWL_Wnd @@ -92,10 +92,10 @@ class CPWL_ListBox : public CPWL_Wnd { void AttachFFLData(CFFL_FormFiller* pData) { m_pFormFiller = pData; } protected: + bool m_bMouseDown = false; + bool m_bHoverSel = false; std::unique_ptr m_pList; std::unique_ptr m_pListNotify; - bool m_bMouseDown; - bool m_bHoverSel; UnownedPtr m_pFillerNotify; private: -- cgit v1.2.3