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_ffbarcode.cpp | 5 ++++- xfa/fxfa/app/xfa_ffcheckbutton.cpp | 9 ++++++--- xfa/fxfa/app/xfa_ffchoicelist.cpp | 10 ++++++++-- xfa/fxfa/app/xfa_ffimageedit.cpp | 5 ++++- xfa/fxfa/app/xfa_ffpushbutton.cpp | 4 +++- xfa/fxfa/app/xfa_fftextedit.cpp | 20 ++++++++++++++++---- 6 files changed, 41 insertions(+), 12 deletions(-) (limited to 'xfa/fxfa') diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp index efe9912f02..cd172c5a4d 100644 --- a/xfa/fxfa/app/xfa_ffbarcode.cpp +++ b/xfa/fxfa/app/xfa_ffbarcode.cpp @@ -131,8 +131,11 @@ FX_BOOL CXFA_FFBarcode::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideString wsText; m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display); pFWLBarcode->SetText(wsText); diff --git a/xfa/fxfa/app/xfa_ffcheckbutton.cpp b/xfa/fxfa/app/xfa_ffcheckbutton.cpp index 829900fa22..9dfb12fa78 100644 --- a/xfa/fxfa/app/xfa_ffcheckbutton.cpp +++ b/xfa/fxfa/app/xfa_ffcheckbutton.cpp @@ -35,10 +35,13 @@ FX_BOOL CXFA_FFCheckButton::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); - if (m_pDataAcc->IsRadioButton()) { + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); + + if (m_pDataAcc->IsRadioButton()) pCheckBox->ModifyStylesEx(FWL_STYLEEXT_CKB_RadioButton, 0xFFFFFFFF); - } + m_pNormalWidget->LockUpdate(); UpdateWidgetProperty(); SetFWLCheckState(m_pDataAcc->GetCheckState()); diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp index 0c6c22c815..06bbc38eb9 100644 --- a/xfa/fxfa/app/xfa_ffchoicelist.cpp +++ b/xfa/fxfa/app/xfa_ffchoicelist.cpp @@ -42,8 +42,11 @@ FX_BOOL CXFA_FFListBox::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideStringArray wsLabelArray; m_pDataAcc->GetChoiceListItems(wsLabelArray, FALSE); int32_t iItems = wsLabelArray.GetSize(); @@ -238,8 +241,11 @@ FX_BOOL CXFA_FFComboBox::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideStringArray wsLabelArray; m_pDataAcc->GetChoiceListItems(wsLabelArray, FALSE); int32_t iItems = wsLabelArray.GetSize(); 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; diff --git a/xfa/fxfa/app/xfa_ffpushbutton.cpp b/xfa/fxfa/app/xfa_ffpushbutton.cpp index 527cfbc239..e648581011 100644 --- a/xfa/fxfa/app/xfa_ffpushbutton.cpp +++ b/xfa/fxfa/app/xfa_ffpushbutton.cpp @@ -55,7 +55,9 @@ FX_BOOL CXFA_FFPushButton::LoadWidget() { CFWL_PushButton* pPushButton = new CFWL_PushButton(GetFWLApp()); pPushButton->Initialize(); - m_pOldDelegate = pPushButton->SetDelegate(this); + m_pOldDelegate = pPushButton->GetCurrentDelegate(); + pPushButton->SetCurrentDelegate(this); + m_pNormalWidget = pPushButton; m_pNormalWidget->SetLayoutItem(this); IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); diff --git a/xfa/fxfa/app/xfa_fftextedit.cpp b/xfa/fxfa/app/xfa_fftextedit.cpp index 1546641a7f..e268f1c4ec 100644 --- a/xfa/fxfa/app/xfa_fftextedit.cpp +++ b/xfa/fxfa/app/xfa_fftextedit.cpp @@ -45,8 +45,11 @@ FX_BOOL CXFA_FFTextEdit::LoadWidget() { IFWL_Widget* pWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pWidget, pWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + UpdateWidgetProperty(); CFX_WideString wsText; m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display); @@ -447,8 +450,11 @@ FX_BOOL CXFA_FFNumericEdit::LoadWidget() { m_pNormalWidget->SetLayoutItem(this); CFWL_NoteDriver* pNoteDriver = pIWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideString wsText; m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display); pWidget->SetText(wsText); @@ -524,8 +530,11 @@ FX_BOOL CXFA_FFPasswordEdit::LoadWidget() { IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pIWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideString wsText; m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display); pWidget->SetText(wsText); @@ -590,8 +599,11 @@ FX_BOOL CXFA_FFDateTimeEdit::LoadWidget() { IFWL_Widget* pIWidget = m_pNormalWidget->GetWidget(); CFWL_NoteDriver* pNoteDriver = pIWidget->GetOwnerApp()->GetNoteDriver(); pNoteDriver->RegisterEventTarget(pIWidget, pIWidget); - m_pOldDelegate = m_pNormalWidget->SetDelegate(this); + + m_pOldDelegate = m_pNormalWidget->GetCurrentDelegate(); + m_pNormalWidget->SetCurrentDelegate(this); m_pNormalWidget->LockUpdate(); + CFX_WideString wsText; m_pDataAcc->GetValue(wsText, XFA_VALUEPICTURE_Display); pWidget->SetEditText(wsText); -- cgit v1.2.3