diff options
Diffstat (limited to 'xfa/fxfa/app/xfa_ffchoicelist.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffchoicelist.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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(); |