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_button.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/pwl/cpwl_button.cpp') diff --git a/fpdfsdk/pwl/cpwl_button.cpp b/fpdfsdk/pwl/cpwl_button.cpp index bdf56a21ae..766e8c49ad 100644 --- a/fpdfsdk/pwl/cpwl_button.cpp +++ b/fpdfsdk/pwl/cpwl_button.cpp @@ -6,11 +6,14 @@ #include "fpdfsdk/pwl/cpwl_button.h" +#include + #include "fpdfsdk/pwl/cpwl_wnd.h" -CPWL_Button::CPWL_Button() : m_bMouseDown(false) {} +CPWL_Button::CPWL_Button(std::unique_ptr pAttachedData) + : CPWL_Wnd(std::move(pAttachedData)) {} -CPWL_Button::~CPWL_Button() {} +CPWL_Button::~CPWL_Button() = default; void CPWL_Button::OnCreate(CreateParams* pParamsToAdjust) { pParamsToAdjust->eCursorType = FXCT_HAND; -- cgit v1.2.3