From 9ec22175f945d227e71c459e7e0b7c464159c18b Mon Sep 17 00:00:00 2001 From: dsinclair Date: Tue, 1 Nov 2016 08:33:02 -0700 Subject: Rename IFWL_Widget::SetDelegate The ::SetDelegate method was misleading. The primary use was SetDelegate(nullptr) which returned the current delegate and didn't actually set anything. When a value was passed it would set the |m_pCurDelegate| not the |m_pDelegate|. This Cl breaks ::SetDelegate into ::GetCurrentDelegate and ::SetCurrentDelegate to make it clear what is happening and that this does not effect the |m_pDelegate| variable. Review-Url: https://codereview.chromium.org/2459423003 --- xfa/fxfa/app/xfa_ffimageedit.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'xfa/fxfa/app/xfa_ffimageedit.cpp') diff --git a/xfa/fxfa/app/xfa_ffimageedit.cpp b/xfa/fxfa/app/xfa_ffimageedit.cpp index 9624ee2fbb..9e29119671 100644 --- a/xfa/fxfa/app/xfa_ffimageedit.cpp +++ b/xfa/fxfa/app/xfa_ffimageedit.cpp @@ -31,7 +31,10 @@ FX_BOOL CXFA_FFImageEdit::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = pPictureBox->SetDelegate(this); + + m_pOldDelegate = pPictureBox->GetCurrentDelegate(); + pPictureBox->SetCurrentDelegate(this); + CXFA_FFField::LoadWidget(); if (m_pDataAcc->GetImageEditImage()) { return TRUE; -- cgit v1.2.3