Remove IFWL_*::Create methods, use new

xfa/fwl/core/ifwl_combobox.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 "xfa/fwl/core/ifwl_combobox.h"
 
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/cfwl_widgetmgr.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/ifwl_app.h"
 #include "xfa/fwl/core/ifwl_comboedit.h"
 #include "xfa/fwl/core/ifwl_combolist.h"
 #include "xfa/fwl/core/ifwl_formproxy.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
-// static
-IFWL_ComboBox* IFWL_ComboBox::Create(
-    const CFWL_WidgetImpProperties& properties) {
-  return new IFWL_ComboBox(properties, nullptr);
-}
-
-IFWL_ComboBox::IFWL_ComboBox(const CFWL_WidgetImpProperties& properties,
-                             IFWL_Widget* pOuter)
-    : IFWL_Widget(properties, pOuter),
+IFWL_ComboBox::IFWL_ComboBox(const CFWL_WidgetImpProperties& properties)
+    : IFWL_Widget(properties, nullptr),
       m_pForm(nullptr),
       m_bLButtonDown(FALSE),
       m_iCurSel(-1),
       m_iBtnState(CFWL_PartState_Normal),
       m_fComboFormHandler(0),
       m_bNeedShowList(FALSE) {
   m_rtClient.Reset();
   m_rtBtn.Reset();
   m_rtHandler.Reset();
 }
@@ skipping 17 matching lines @@
     return FWL_Error::Indefinite;
 
   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;
-  m_pListBox.reset(IFWL_ComboList::Create(prop, this));
+  m_pListBox.reset(new IFWL_ComboList(prop, this));
   m_pListBox->Initialize();
   if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown) && !m_pEdit) {
     CFWL_WidgetImpProperties prop2;
-    m_pEdit.reset(IFWL_ComboEdit::Create(prop2, this));
+    m_pEdit.reset(new IFWL_ComboEdit(prop2, this));
     m_pEdit->Initialize();
     m_pEdit->SetOuter(this);
   }
   if (m_pEdit)
     m_pEdit->SetParent(this);
 
   SetStates(m_pProperties->m_dwStates);
   return FWL_Error::Succeeded;
 }
 
@@ skipping 34 matching lines @@
 
 FWL_Error IFWL_ComboBox::ModifyStylesEx(uint32_t dwStylesExAdded,
                                         uint32_t dwStylesExRemoved) {
   if (m_pWidgetMgr->IsFormDisabled()) {
     return DisForm_ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
   }
   bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
   bool bRemoveDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
   if (bAddDropDown && !m_pEdit) {
     CFWL_WidgetImpProperties prop;
-    m_pEdit.reset(IFWL_ComboEdit::Create(prop, nullptr));
+    m_pEdit.reset(new IFWL_ComboEdit(prop, nullptr));
     m_pEdit->Initialize();
     m_pEdit->SetOuter(this);
     m_pEdit->SetParent(this);
   } else if (bRemoveDropDown && m_pEdit) {
     m_pEdit->SetStates(FWL_WGTSTATE_Invisible, TRUE);
   }
   return IFWL_Widget::ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
 }
 
 FWL_Error IFWL_ComboBox::Update() {
@@ skipping 577 matching lines @@
 void IFWL_ComboBox::InitProxyForm() {
   if (m_pForm)
     return;
   if (!m_pListBox)
     return;
 
   CFWL_WidgetImpProperties propForm;
   propForm.m_pOwner = this;
   propForm.m_dwStyles = FWL_WGTSTYLE_Popup;
   propForm.m_dwStates = FWL_WGTSTATE_Invisible;
-  m_pForm = IFWL_FormProxy::Create(propForm, m_pListBox.get());
+
+  m_pForm = new IFWL_FormProxy(propForm, m_pListBox.get());
   m_pForm->Initialize();
   m_pListBox->SetParent(m_pForm);
   m_pListProxyDelegate = new CFWL_ComboProxyImpDelegate(m_pForm, this);
   m_pForm->SetDelegate(m_pListProxyDelegate);
 }
 
 FWL_Error IFWL_ComboBox::DisForm_Initialize() {
   if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
     return FWL_Error::Indefinite;
 
   m_pDelegate = new CFWL_ComboBoxImpDelegate(this);
   DisForm_InitComboList();
   DisForm_InitComboEdit();
   return FWL_Error::Succeeded;
 }
 
 void IFWL_ComboBox::DisForm_InitComboList() {
   if (m_pListBox)
     return;
 
   CFWL_WidgetImpProperties prop;
   prop.m_pParent = this;
   prop.m_dwStyles = FWL_WGTSTYLE_Border | FWL_WGTSTYLE_VScroll;
   prop.m_dwStates = FWL_WGTSTATE_Invisible;
   prop.m_pDataProvider = m_pProperties->m_pDataProvider;
   prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pListBox.reset(IFWL_ComboList::Create(prop, this));
+  m_pListBox.reset(new IFWL_ComboList(prop, this));
   m_pListBox->Initialize();
 }
 
 void IFWL_ComboBox::DisForm_InitComboEdit() {
   if (m_pEdit) {
     return;
   }
   CFWL_WidgetImpProperties prop;
   prop.m_pParent = this;
   prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
-  m_pEdit.reset(IFWL_ComboEdit::Create(prop, this));
+  m_pEdit.reset(new IFWL_ComboEdit(prop, this));
   m_pEdit->Initialize();
   m_pEdit->SetOuter(this);
 }
 
 void IFWL_ComboBox::DisForm_ShowDropList(FX_BOOL bActivate) {
   FX_BOOL bDropList = DisForm_IsDropListShowed();
   if (bDropList == bActivate) {
     return;
   }
   if (bActivate) {
@@ skipping 660 matching lines @@
 }
 
 void CFWL_ComboProxyImpDelegate::OnFocusChanged(CFWL_MsgKillFocus* pMsg,
                                                 FX_BOOL bSet) {
   if (!bSet) {
     if (!pMsg->m_pSetFocus) {
       m_pComboBox->ShowDropList(FALSE);
     }
   }
 }