Remove unused CFWL_WidgetMgr::GetSameGroupRadioButton(). In turn, remove other CFWL_WidgetMgr methods made unused by this change. In turn, CFWL_Widget::GetStyles() becomes unused. Change-Id: I169790b7e2566b37ac81d1bd0aba73f99f3d0132 Reviewed-on: https://pdfium-review.googlesource.com/c/49411 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp index 8e7ba77..0150bbb 100644 --- a/xfa/fwl/cfwl_widget.cpp +++ b/xfa/fwl/cfwl_widget.cpp
@@ -83,10 +83,6 @@ m_pWidgetMgr->SetParent(pParent, this); } -uint32_t CFWL_Widget::GetStyles() const { - return m_pProperties->m_dwStyles; -} - void CFWL_Widget::ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved) { m_pProperties->m_dwStyles =
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h index 92491a0..a1fbf62 100644 --- a/xfa/fwl/cfwl_widget.h +++ b/xfa/fwl/cfwl_widget.h
@@ -86,7 +86,6 @@ CFWL_Widget* GetOwner() { return m_pWidgetMgr->GetOwnerWidget(this); } CFWL_Widget* GetOuter() const { return m_pOuter; } - uint32_t GetStyles() const; void ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved); uint32_t GetStylesEx() const; uint32_t GetStates() const;
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp index e1659d2..bf3b7cb 100644 --- a/xfa/fwl/cfwl_widgetmgr.cpp +++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -263,38 +263,6 @@ return nullptr; } -int32_t CFWL_WidgetMgr::CountRadioButtonGroup(CFWL_Widget* pFirst) const { - int32_t iRet = 0; - CFWL_Widget* pChild = pFirst; - while (pChild) { - pChild = GetNextSiblingWidget(pChild); - ++iRet; - } - return iRet; -} - -CFWL_Widget* CFWL_WidgetMgr::GetRadioButtonGroupHeader( - CFWL_Widget* pRadioButton) const { - CFWL_Widget* pNext = pRadioButton; - if (pNext && (pNext->GetStyles() & FWL_WGTSTYLE_Group)) - return pNext; - return nullptr; -} - -std::vector<CFWL_Widget*> CFWL_WidgetMgr::GetSameGroupRadioButton( - CFWL_Widget* pRadioButton) const { - CFWL_Widget* pFirst = GetFirstSiblingWidget(pRadioButton); - if (!pFirst) - pFirst = pRadioButton; - - if (CountRadioButtonGroup(pFirst) < 2) - return std::vector<CFWL_Widget*>(); - - std::vector<CFWL_Widget*> group; - group.push_back(GetRadioButtonGroupHeader(pRadioButton)); - return group; -} - CFWL_Widget* CFWL_WidgetMgr::GetDefaultButton(CFWL_Widget* pParent) const { if ((pParent->GetClassID() == FWL_Type::PushButton) && (pParent->GetStates() & (1 << (FWL_WGTSTATE_MAX + 2)))) {
diff --git a/xfa/fwl/cfwl_widgetmgr.h b/xfa/fwl/cfwl_widgetmgr.h index f3bb734..796b37e 100644 --- a/xfa/fwl/cfwl_widgetmgr.h +++ b/xfa/fwl/cfwl_widgetmgr.h
@@ -48,9 +48,6 @@ const CFX_PointF& point) const; CFWL_Widget* NextTab(CFWL_Widget* parent, CFWL_Widget* focus, bool& bFind); - std::vector<CFWL_Widget*> GetSameGroupRadioButton( - CFWL_Widget* pRadioButton) const; - CFWL_Widget* GetDefaultButton(CFWL_Widget* pParent) const; void AddRedrawCounts(CFWL_Widget* pWidget); @@ -83,12 +80,7 @@ Item* GetWidgetMgrItem(const CFWL_Widget* pWidget) const; void AppendWidget(CFWL_Widget* pWidget); - - int32_t CountRadioButtonGroup(CFWL_Widget* pFirst) const; - CFWL_Widget* GetRadioButtonGroupHeader(CFWL_Widget* pRadioButton) const; - void ResetRedrawCounts(CFWL_Widget* pWidget); - void DrawChild(CFWL_Widget* pParent, const CFX_RectF& rtClip, CXFA_Graphics* pGraphics,