Index: xfa/fxfa/app/xfa_ffchoicelist.cpp |
diff --git a/xfa/fxfa/app/xfa_ffchoicelist.cpp b/xfa/fxfa/app/xfa_ffchoicelist.cpp |
index 0c6c22c815a0b6d7ba1043f7c3da7f49412da4f7..06bbc38eb96cbd8bae6e3ccf924ae9eb70da2623 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(); |