commit 49cc930fca516eb75c0a43a047062417e9c0ca6e
author Haibo Huang <hhb@google.com> Mon Apr 27 16:14:24 2020 -0700
committer Haibo Huang <hhb@google.com> Tue May 05 06:45:11 2020 +0000
tree 18b7d6644eb876c364273b2a939939d4d7fa682d
parent d5e904168eee13897179219c6bdb1ea13acf5b74

Merge commit '04bb1f2f035343217875ce0fc19d3a7abde41717' into HEAD

Bug: 155031873
Change-Id: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227
Merged-In: Ie7dc3f5c4b8999adf8e8885761fe65fd6ee65227

xfa/fwl/cfwl_comboedit.cpp

diff --git a/xfa/fwl/cfwl_comboedit.cpp b/xfa/fwl/cfwl_comboedit.cpp
index 4fa1277..6ab081a 100644
--- a/xfa/fwl/cfwl_comboedit.cpp
+++ b/xfa/fwl/cfwl_comboedit.cpp
@@ -18,9 +18,10 @@
     std::unique_ptr<CFWL_WidgetProperties> properties,
     CFWL_Widget* pOuter)
     : CFWL_Edit(app, std::move(properties), pOuter) {
-  m_pOuter = static_cast<CFWL_ComboBox*>(pOuter);
 }
 
+CFWL_ComboEdit::~CFWL_ComboEdit() = default;
+
 void CFWL_ComboEdit::ClearSelected() {
   ClearSelection();
   RepaintRect(GetRTClient());
@@ -62,7 +63,6 @@
       if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
           ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
         SetSelected();
-        m_pOuter->SetFocus(true);
       }
       break;
     }