diff options
Diffstat (limited to 'xfa/fwl')
| -rw-r--r-- | xfa/fwl/core/fwl_widgetmgrimp.cpp | 14 | ||||
| -rw-r--r-- | xfa/fwl/lightwidget/cfwl_theme.cpp | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/xfa/fwl/core/fwl_widgetmgrimp.cpp b/xfa/fwl/core/fwl_widgetmgrimp.cpp index ff379722e7..93f39a98e5 100644 --- a/xfa/fwl/core/fwl_widgetmgrimp.cpp +++ b/xfa/fwl/core/fwl_widgetmgrimp.cpp @@ -447,21 +447,17 @@ IFWL_Widget* CFWL_WidgetMgr::GetSiblingRadioButton(IFWL_Widget* pWidget, } IFWL_Widget* CFWL_WidgetMgr::GetRadioButtonGroupHeader( IFWL_Widget* pRadioButton) { - if (pRadioButton->GetStyles() & FWL_WGTSTYLE_Group) { - return pRadioButton; - } IFWL_Widget* pNext = pRadioButton; - while ((pNext = GetSiblingRadioButton(pNext, FALSE)) != NULL) { - if (pNext->GetStyles() & FWL_WGTSTYLE_Group) { + while (pNext) { + if (pNext->GetStyles() & FWL_WGTSTYLE_Group) return pNext; - } + pNext = GetSiblingRadioButton(pNext, FALSE); } pNext = GetWidget(pRadioButton, FWL_WGTRELATION_LastSibling); - while ((pNext = GetSiblingRadioButton(pNext, FALSE)) && pNext && + while ((pNext = GetSiblingRadioButton(pNext, FALSE)) != nullptr && pNext != pRadioButton) { - if (pNext->GetStyles() & FWL_WGTSTYLE_Group) { + if (pNext->GetStyles() & FWL_WGTSTYLE_Group) return pNext; - } } pNext = GetWidget(pRadioButton, FWL_WGTRELATION_FirstSibling); return GetSiblingRadioButton(pNext, TRUE); diff --git a/xfa/fwl/lightwidget/cfwl_theme.cpp b/xfa/fwl/lightwidget/cfwl_theme.cpp index a070e046c1..4824667080 100644 --- a/xfa/fwl/lightwidget/cfwl_theme.cpp +++ b/xfa/fwl/lightwidget/cfwl_theme.cpp @@ -56,7 +56,7 @@ uint32_t CFWL_Theme::GetThemeID(IFWL_Widget* pWidget) { uint32_t CFWL_Theme::SetThemeID(IFWL_Widget* pWidget, uint32_t dwThemeID, FX_BOOL bChildren) { - uint32_t dwID; + uint32_t dwID = 0; for (const auto& pTheme : m_ThemesArray) { dwID = pTheme->GetThemeID(pWidget); pTheme->SetThemeID(pWidget, dwThemeID, FALSE); |