| Index: xfa/fwl/lightwidget/cfwl_checkbox.cpp
|
| diff --git a/xfa/fwl/lightwidget/cfwl_checkbox.cpp b/xfa/fwl/lightwidget/cfwl_checkbox.cpp
|
| index b5e2a87d67a78ca4e4aab50a9dc9e8f9713e187b..a93bc4674aaa7b1a1a2d9440a17765c3fa084aca 100644
|
| --- a/xfa/fwl/lightwidget/cfwl_checkbox.cpp
|
| +++ b/xfa/fwl/lightwidget/cfwl_checkbox.cpp
|
| @@ -14,38 +14,38 @@ CFWL_CheckBox* CFWL_CheckBox::Create() {
|
| return new CFWL_CheckBox;
|
| }
|
|
|
| -FWL_ERR CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
|
| +FWL_Error CFWL_CheckBox::Initialize(const CFWL_WidgetProperties* pProperties) {
|
| if (m_pIface)
|
| - return FWL_ERR_Indefinite;
|
| + return FWL_Error::Indefinite;
|
| if (pProperties) {
|
| *m_pProperties = *pProperties;
|
| }
|
| std::unique_ptr<IFWL_CheckBox> pCheckBox(IFWL_CheckBox::Create(
|
| m_pProperties->MakeWidgetImpProperties(&m_checkboxData), nullptr));
|
| - FWL_ERR ret = pCheckBox->Initialize();
|
| - if (ret != FWL_ERR_Succeeded) {
|
| + FWL_Error ret = pCheckBox->Initialize();
|
| + if (ret != FWL_Error::Succeeded) {
|
| return ret;
|
| }
|
| m_pIface = pCheckBox.release();
|
| CFWL_Widget::Initialize();
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
|
|
| -FWL_ERR CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) {
|
| +FWL_Error CFWL_CheckBox::SetCaption(const CFX_WideStringC& wsCaption) {
|
| m_checkboxData.m_wsCaption = wsCaption;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
|
|
| -FWL_ERR CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) {
|
| +FWL_Error CFWL_CheckBox::SetBoxSize(FX_FLOAT fHeight) {
|
| m_checkboxData.m_fBoxHeight = fHeight;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
|
|
| int32_t CFWL_CheckBox::GetCheckState() {
|
| return static_cast<IFWL_CheckBox*>(m_pIface)->GetCheckState();
|
| }
|
|
|
| -FWL_ERR CFWL_CheckBox::SetCheckState(int32_t iCheck) {
|
| +FWL_Error CFWL_CheckBox::SetCheckState(int32_t iCheck) {
|
| return static_cast<IFWL_CheckBox*>(m_pIface)->SetCheckState(iCheck);
|
| }
|
|
|
| @@ -56,10 +56,11 @@ CFWL_CheckBox::~CFWL_CheckBox() {}
|
| CFWL_CheckBox::CFWL_CheckBoxDP::CFWL_CheckBoxDP()
|
| : m_fBoxHeight(16.0f), m_wsCaption(L"Check box") {}
|
|
|
| -FWL_ERR CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption(IFWL_Widget* pWidget,
|
| - CFX_WideString& wsCaption) {
|
| +FWL_Error CFWL_CheckBox::CFWL_CheckBoxDP::GetCaption(
|
| + IFWL_Widget* pWidget,
|
| + CFX_WideString& wsCaption) {
|
| wsCaption = m_wsCaption;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
|
|
| FX_FLOAT CFWL_CheckBox::CFWL_CheckBoxDP::GetBoxSize(IFWL_Widget* pWidget) {
|
|
|