Remove FWL globals.

xfa/fwl/core/cfwl_listbox.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/cfwl_listbox.h"
 
 #include <memory>
 
 #include "third_party/base/stl_util.h"
 
+CFWL_ListBox::CFWL_ListBox(const IFWL_App* app) : CFWL_Widget(app) {}
+
+CFWL_ListBox::~CFWL_ListBox() {}
+
+void CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
+  ASSERT(!m_pIface);
+
+  if (pProperties)
+    *m_pProperties = *pProperties;
+
+  std::unique_ptr<IFWL_ListBox> pListBox(new IFWL_ListBox(
+      m_pApp, m_pProperties->MakeWidgetImpProperties(&m_ListBoxDP), nullptr));
+  pListBox->Initialize();
+
+  m_pIface = std::move(pListBox);
+  CFWL_Widget::Initialize(pProperties);
+}
+
 IFWL_ListBox* CFWL_ListBox::GetWidget() {
   return static_cast<IFWL_ListBox*>(m_pIface.get());
 }
 
 const IFWL_ListBox* CFWL_ListBox::GetWidget() const {
   return static_cast<IFWL_ListBox*>(m_pIface.get());
 }
 
-FWL_Error CFWL_ListBox::Initialize(const CFWL_WidgetProperties* pProperties) {
-  if (m_pIface)
-    return FWL_Error::Indefinite;
-  if (pProperties) {
-    *m_pProperties = *pProperties;
-  }
-  std::unique_ptr<IFWL_ListBox> pListBox(new IFWL_ListBox(
-      m_pProperties->MakeWidgetImpProperties(&m_ListBoxDP), nullptr));
-  FWL_Error ret = pListBox->Initialize();
-  if (ret != FWL_Error::Succeeded) {
-    return ret;
-  }
-  m_pIface = std::move(pListBox);
-  CFWL_Widget::Initialize();
-  return FWL_Error::Succeeded;
-}
-
 FWL_Error CFWL_ListBox::AddDIBitmap(CFX_DIBitmap* pDIB, IFWL_ListItem* pItem) {
   static_cast<CFWL_ListItem*>(pItem)->m_pDIB = pDIB;
   return FWL_Error::Succeeded;
 }
 
 IFWL_ListItem* CFWL_ListBox::AddString(const CFX_WideStringC& wsAdd,
                                        FX_BOOL bSelect) {
   std::unique_ptr<CFWL_ListItem> pItem(new CFWL_ListItem);
   pItem->m_dwStates = 0;
   pItem->m_wsText = wsAdd;
@@ skipping 148 matching lines @@
   return nullptr;
 }
 
 uint32_t CFWL_ListBox::GetItemStates(IFWL_ListItem* pItem) {
   if (!pItem)
     return 0;
   CFWL_ListItem* pListItem = static_cast<CFWL_ListItem*>(pItem);
   return pListItem->m_dwStates | pListItem->m_dwCheckState;
 }
 
-CFWL_ListBox::CFWL_ListBox() {}
-
-CFWL_ListBox::~CFWL_ListBox() {}
-
 CFWL_ListBox::CFWL_ListBoxDP::CFWL_ListBoxDP() {}
 
 CFWL_ListBox::CFWL_ListBoxDP::~CFWL_ListBoxDP() {}
 
 FWL_Error CFWL_ListBox::CFWL_ListBoxDP::GetCaption(IFWL_Widget* pWidget,
                                                    CFX_WideString& wsCaption) {
   wsCaption = m_wsData;
   return FWL_Error::Succeeded;
 }
 
@@ skipping 126 matching lines @@
   m_rtItem.Reset();
   m_dwStates = 0;
   m_wsText = L"";
   m_pDIB = nullptr;
   m_pData = nullptr;
   m_dwCheckState = 0;
   m_rtCheckBox.Reset();
 }
 
 CFWL_ListItem::~CFWL_ListItem() {}