Fix CFWL_WidgetImpDelegate hierarchy.

xfa/src/fwl/src/basewidget/fwl_comboboximp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../foxitlib.h"
 #include "../../src/core/include/fwl_threadimp.h"
 #include "../../src/core/include/fwl_appimp.h"
 #include "../core/include/fwl_targetimp.h"
@@ skipping 188 matching lines @@
   FXSYS_assert(pOuter != NULL);
 }
 CFWL_ComboListImp::CFWL_ComboListImp(const CFWL_WidgetImpProperties& properties,
                                      IFWL_Widget* pOuter)
     : CFWL_ListBoxImp(properties, pOuter), m_bNotifyOwner(TRUE) {
   FXSYS_assert(pOuter != NULL);
 }
 FWL_ERR CFWL_ComboListImp::Initialize() {
   _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_ListBoxImp::Initialize(),
                                       FWL_ERR_Indefinite);
-  if (m_pDelegate) {
-    delete (CFWL_ComboListImpDelegate*)m_pDelegate;
-    m_pDelegate = NULL;
-  }
-  m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboListImpDelegate(this);
+  delete m_pDelegate;
+  m_pDelegate = new CFWL_ComboListImpDelegate(this);
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_ComboListImp::Finalize() {
-  if (m_pDelegate) {
-    delete (CFWL_ComboListImpDelegate*)m_pDelegate;
-    m_pDelegate = NULL;
-  }
+  delete m_pDelegate;
+  m_pDelegate = nullptr;
   return CFWL_ListBoxImp::Finalize();
 }
 int32_t CFWL_ComboListImp::MatchItem(const CFX_WideString& wsMatch) {
   if (wsMatch.IsEmpty()) {
     return -1;
   }
   _FWL_RETURN_VALUE_IF_FAIL(m_pProperties->m_pDataProvider, -1);
   IFWL_ListBoxDP* pData = (IFWL_ListBoxDP*)m_pProperties->m_pDataProvider;
   int32_t iCount = pData->CountItems(m_pInterface);
   for (int32_t i = 0; i < iCount; i++) {
@@ skipping 281 matching lines @@
 }
 FX_DWORD CFWL_ComboBoxImp::GetClassID() const {
   return FWL_CLASSHASH_ComboBox;
 }
 FWL_ERR CFWL_ComboBoxImp::Initialize() {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_Initialize();
   }
   _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
                                       FWL_WGTSTATE_Invisible);
-  m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
+  m_pDelegate = new CFWL_ComboBoxImpDelegate(this);
   CFWL_WidgetImpProperties prop;
   prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
   prop.m_dwStyles |= FWL_WGTSTYLE_Border | FWL_WGTSTYLE_VScroll;
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_ListItemIconText) {
     prop.m_dwStyleExes |= FWL_STYLEEXT_LTB_Icon;
   }
   prop.m_pDataProvider = m_pProperties->m_pDataProvider;
   CFWL_ComboListImp* pList = new CFWL_ComboListImp(prop, m_pInterface);
   m_pListBox = IFWL_ListBox::Create();
   pList->SetInterface(m_pListBox);
@@ skipping 11 matching lines @@
     m_pEdit->SetParent(m_pInterface);
   }
   SetStates(m_pProperties->m_dwStates);
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_ComboBoxImp::Finalize() {
   if (m_pEdit) {
     m_pEdit->Finalize();
   }
   m_pListBox->Finalize();
-  if (m_pDelegate) {
-    delete (CFWL_ComboBoxImpDelegate*)m_pDelegate;
-    m_pDelegate = NULL;
-  }
+  delete m_pDelegate;
+  m_pDelegate = nullptr;
   return CFWL_WidgetImp::Finalize();
 }
 FWL_ERR CFWL_ComboBoxImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
   if (bAutoSize) {
     rect.Reset();
     FX_BOOL bIsDropDown = IsDropDownStyle();
     if (bIsDropDown && m_pEdit) {
       m_pEdit->GetWidgetRect(rect, TRUE);
     } else {
       rect.width = 100;
@@ skipping 576 matching lines @@
   propForm.m_pOwner = m_pInterface;
   propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
   propForm.m_dwStates = FWL_WGTSTATE_Invisible;
   m_pProxy = new CFWL_FormProxyImp(propForm, m_pListBox);
   m_pForm = IFWL_Form::Create();
   m_pProxy->SetInterface(m_pForm);
   m_pForm->SetImpl(m_pProxy);
   m_pProxy->Initialize();
   m_pListBox->SetParent((IFWL_Widget*)m_pForm);
   m_pListProxyDelegate = new CFWL_ComboProxyImpDelegate(m_pForm, this);
-  m_pProxy->SetDelegate((IFWL_WidgetDelegate*)m_pListProxyDelegate);
+  m_pProxy->SetDelegate(m_pListProxyDelegate);
 }
 FWL_ERR CFWL_ComboBoxImp::DisForm_Initialize() {
   _FWL_ERR_CHECK_RETURN_VALUE_IF_FAIL(CFWL_WidgetImp::Initialize(),
                                       FWL_WGTSTATE_Invisible);
-  m_pDelegate = (IFWL_WidgetDelegate*)new CFWL_ComboBoxImpDelegate(this);
+  m_pDelegate = new CFWL_ComboBoxImpDelegate(this);
   DisForm_InitComboList();
   DisForm_InitComboEdit();
   return FWL_ERR_Succeeded;
 }
 void CFWL_ComboBoxImp::DisForm_InitComboList() {
   if (m_pListBox) {
     return;
   }
   CFWL_WidgetImpProperties prop;
   prop.m_pParent = (IFWL_Widget*)this->m_pInterface;
@@ skipping 694 matching lines @@
   m_pComboBox->ShowDropList(FALSE);
 }
 void CFWL_ComboProxyImpDelegate::OnFocusChanged(CFWL_MsgKillFocus* pMsg,
                                                 FX_BOOL bSet) {
   if (!bSet) {
     if (pMsg->m_pSetFocus == NULL) {
       m_pComboBox->ShowDropList(FALSE);
     }
   }
 }