diff options
| author | tsepez <tsepez@chromium.org> | 2016-05-24 09:46:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-05-24 09:46:02 -0700 |
| commit | 1529756d0d62638ea0fc7965416bef717ff47413 (patch) | |
| tree | 81f94e0c8cc9e093a97bf59d907d051bb6086039 /xfa/fwl/basewidget | |
| parent | ded3634145b214b11212a7c53faa8ba15a1789ca (diff) | |
| download | pdfium-1529756d0d62638ea0fc7965416bef717ff47413.tar.xz | |
Remove IWFL_WidgetMgr in favor of CFWL_WidgetMgr.
The pure virtual class isn't buying us anything, and is costing
us an otherwise unneeded vtable.
Fix pre-existing presubmit warning in fwl_noteimp.cpp:88:
If statement had no body and no else clause ...
Remove switch on enum() and make separate GetWidget() methods.
Review-Url: https://codereview.chromium.org/2004213002
Diffstat (limited to 'xfa/fwl/basewidget')
| -rw-r--r-- | xfa/fwl/basewidget/fwl_checkboximp.cpp | 3 | ||||
| -rw-r--r-- | xfa/fwl/basewidget/fwl_editimp.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/xfa/fwl/basewidget/fwl_checkboximp.cpp b/xfa/fwl/basewidget/fwl_checkboximp.cpp index 574da160ee..ade6ebf155 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.cpp +++ b/xfa/fwl/basewidget/fwl_checkboximp.cpp @@ -368,8 +368,7 @@ void CFWL_CheckBoxImp::NextStates() { if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CKB_RadioButton) { if ((m_pProperties->m_dwStates & FWL_STATE_CKB_CheckMask) == FWL_STATE_CKB_Unchecked) { - CFWL_WidgetMgr* pWidgetMgr = - static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr()); + CFWL_WidgetMgr* pWidgetMgr = CFWL_WidgetMgr::GetInstance(); if (!pWidgetMgr->IsFormDisabled()) { CFX_ArrayTemplate<IFWL_Widget*> radioarr; pWidgetMgr->GetSameGroupRadioButton(m_pInterface, radioarr); diff --git a/xfa/fwl/basewidget/fwl_editimp.cpp b/xfa/fwl/basewidget/fwl_editimp.cpp index 423d0b5c28..5975062902 100644 --- a/xfa/fwl/basewidget/fwl_editimp.cpp +++ b/xfa/fwl/basewidget/fwl_editimp.cpp @@ -1013,8 +1013,7 @@ void CFWL_EditImp::DrawContent(CFX_Graphics* pGraphics, (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_NoHideSel) || (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused); if (bShowSel) { - IFWL_Widget* pForm = - m_pWidgetMgr->GetWidget(m_pInterface, FWL_WGTRELATION_SystemForm); + IFWL_Widget* pForm = m_pWidgetMgr->GetSystemFormWidget(m_pInterface); if (pForm) { bShowSel = (pForm->GetStates() & FWL_WGTSTATE_Deactivated) != FWL_WGTSTATE_Deactivated; |