| Index: xfa/fwl/basewidget/fwl_comboboximp.cpp
|
| diff --git a/xfa/fwl/basewidget/fwl_comboboximp.cpp b/xfa/fwl/basewidget/fwl_comboboximp.cpp
|
| index fd7c6d6266e4dea51fc86d5b96e17a50f3f5c1ba..35ac5fa2406945372c5c7d2f32a1ae12f2e5f5ae 100644
|
| --- a/xfa/fwl/basewidget/fwl_comboboximp.cpp
|
| +++ b/xfa/fwl/basewidget/fwl_comboboximp.cpp
|
| @@ -557,8 +557,8 @@ FWL_ERR CFWL_ComboBoxImp::ModifyStylesEx(uint32_t dwStylesExAdded,
|
| if (m_pWidgetMgr->IsFormDisabled()) {
|
| return DisForm_ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
|
| }
|
| - FX_BOOL bAddDropDown = dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown;
|
| - FX_BOOL bRemoveDropDown = dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown;
|
| + bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
|
| + bool bRemoveDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
|
| if (bAddDropDown && !m_pEdit) {
|
| CFWL_WidgetImpProperties prop;
|
| m_pEdit.reset(IFWL_Edit::CreateComboEdit(prop, nullptr));
|
| @@ -1232,8 +1232,8 @@ FWL_ERR CFWL_ComboBoxImp::DisForm_ModifyStylesEx(uint32_t dwStylesExAdded,
|
| if (!m_pEdit) {
|
| DisForm_InitComboEdit();
|
| }
|
| - FX_BOOL bAddDropDown = dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown;
|
| - FX_BOOL bDelDropDown = dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown;
|
| + bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
|
| + bool bDelDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
|
| dwStylesExRemoved &= ~FWL_STYLEEXT_CMB_DropDown;
|
| m_pProperties->m_dwStyleExes |= FWL_STYLEEXT_CMB_DropDown;
|
| if (bAddDropDown) {
|
|
|