From 6fe8795d9022105a0061a0a81be9a49d49fda345 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 1 Nov 2016 18:48:19 -0700 Subject: Fold IFWL*::{Initialize|Finalize} into constructor/destructor This Cl moves the ::Initialize method into the constructors and the ::Finalize method into the destructors. The |m_pDelegate| is made private and a unique_ptr. A |SetDelegate| and |GetDelegate| method are added. Review-Url: https://codereview.chromium.org/2464703006 --- xfa/fwl/core/ifwl_tooltip.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'xfa/fwl/core/ifwl_tooltip.cpp') diff --git a/xfa/fwl/core/ifwl_tooltip.cpp b/xfa/fwl/core/ifwl_tooltip.cpp index 815670ed75..371709772e 100644 --- a/xfa/fwl/core/ifwl_tooltip.cpp +++ b/xfa/fwl/core/ifwl_tooltip.cpp @@ -6,6 +6,7 @@ #include "xfa/fwl/core/ifwl_tooltip.h" +#include "third_party/base/ptr_util.h" #include "xfa/fde/tto/fde_textout.h" #include "xfa/fwl/core/cfwl_themebackground.h" #include "xfa/fwl/core/cfwl_themepart.h" @@ -29,24 +30,13 @@ IFWL_ToolTip::IFWL_ToolTip(const IFWL_App* app, m_rtClient.Set(0, 0, 0, 0); m_rtCaption.Set(0, 0, 0, 0); m_rtAnchor.Set(0, 0, 0, 0); -} - -IFWL_ToolTip::~IFWL_ToolTip() {} - -void IFWL_ToolTip::Initialize() { - IFWL_Widget::Initialize(); - - m_pProperties->m_dwStyles |= FWL_WGTSTYLE_Popup; m_pProperties->m_dwStyles &= ~FWL_WGTSTYLE_Child; + m_pProperties->m_dwStyles |= FWL_WGTSTYLE_Popup; - m_pDelegate = new CFWL_ToolTipImpDelegate(this); + SetDelegate(pdfium::MakeUnique(this)); } -void IFWL_ToolTip::Finalize() { - delete m_pDelegate; - m_pDelegate = nullptr; - IFWL_Widget::Finalize(); -} +IFWL_ToolTip::~IFWL_ToolTip() {} FWL_Type IFWL_ToolTip::GetClassID() const { return FWL_Type::ToolTip; -- cgit v1.2.3