diff options
author | dsinclair <dsinclair@chromium.org> | 2016-10-31 07:29:34 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-10-31 07:29:34 -0700 |
commit | 20855384b8149a631c3c1d229551523c12eb767b (patch) | |
tree | e3cef278e322742bea6c4b48f40ed580754ebd80 /xfa/fwl/core/cfwl_listbox.cpp | |
parent | 747dcf775c5cb661e96a639f73322cc489d8590f (diff) | |
download | pdfium-20855384b8149a631c3c1d229551523c12eb767b.tar.xz |
Remove FWL globals.
This CL removes the FWL_GetApp, FWL_SetApp and FWL_GetWidgetAdapter methods.
In the process it changes the various Initialize methods to return void.
Review-Url: https://codereview.chromium.org/2436103002
Diffstat (limited to 'xfa/fwl/core/cfwl_listbox.cpp')
-rw-r--r-- | xfa/fwl/core/cfwl_listbox.cpp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/xfa/fwl/core/cfwl_listbox.cpp b/xfa/fwl/core/cfwl_listbox.cpp index 3884e8c42e..f8a5e199c2 100644 --- a/xfa/fwl/core/cfwl_listbox.cpp +++ b/xfa/fwl/core/cfwl_listbox.cpp @@ -10,6 +10,24 @@ #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()); } @@ -18,23 +36,6 @@ 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; @@ -203,10 +204,6 @@ uint32_t CFWL_ListBox::GetItemStates(IFWL_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() {} |