diff options
author | dsinclair <dsinclair@chromium.org> | 2016-05-04 17:57:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-04 17:57:03 -0700 |
commit | c777f486f84611d2fdd2d03af661b14955f9efb6 (patch) | |
tree | 679012454d82e885f749d17f75fd12735efec29a /xfa/fwl/lightwidget/cfwl_pushbutton.cpp | |
parent | 41aad19ba366540bd4efa20a9009ac1c70a81403 (diff) | |
download | pdfium-c777f486f84611d2fdd2d03af661b14955f9efb6.tar.xz |
Convert FWL_ERR into an enum class.
This Cl updates FWL_ERR to be an FWL_Error enum class. It removes FX_ERR and
replaces it with FWL_Error as well as the values were the same.
There were many places where we either returned other values for FWL_ERR
results.
This Cl is the same as: https://codereview.chromium.org/1943413002/ but I seem
to have messed up the base URL in that one.
TBR=tsepez@chromium.org
Review-Url: https://codereview.chromium.org/1952693003
Diffstat (limited to 'xfa/fwl/lightwidget/cfwl_pushbutton.cpp')
-rw-r--r-- | xfa/fwl/lightwidget/cfwl_pushbutton.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp b/xfa/fwl/lightwidget/cfwl_pushbutton.cpp index 52747bdebe..7c8a9fa64d 100644 --- a/xfa/fwl/lightwidget/cfwl_pushbutton.cpp +++ b/xfa/fwl/lightwidget/cfwl_pushbutton.cpp @@ -12,51 +12,52 @@ CFWL_PushButton* CFWL_PushButton::Create() { return new CFWL_PushButton; } -FWL_ERR CFWL_PushButton::Initialize(const CFWL_WidgetProperties* pProperties) { +FWL_Error CFWL_PushButton::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_PushButton> pPushButton(IFWL_PushButton::Create( m_pProperties->MakeWidgetImpProperties(&m_buttonData), nullptr)); - FWL_ERR ret = pPushButton->Initialize(); - if (ret != FWL_ERR_Succeeded) { + FWL_Error ret = pPushButton->Initialize(); + if (ret != FWL_Error::Succeeded) { return ret; } m_pIface = pPushButton.release(); CFWL_Widget::Initialize(); - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_PushButton::GetCaption(CFX_WideString& wsCaption) { +FWL_Error CFWL_PushButton::GetCaption(CFX_WideString& wsCaption) { wsCaption = m_buttonData.m_wsCaption; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } -FWL_ERR CFWL_PushButton::SetCaption(const CFX_WideStringC& wsCaption) { +FWL_Error CFWL_PushButton::SetCaption(const CFX_WideStringC& wsCaption) { m_buttonData.m_wsCaption = wsCaption; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } CFX_DIBitmap* CFWL_PushButton::GetPicture() { return m_buttonData.m_pBitmap; } -FWL_ERR CFWL_PushButton::SetPicture(CFX_DIBitmap* pBitmap) { +FWL_Error CFWL_PushButton::SetPicture(CFX_DIBitmap* pBitmap) { m_buttonData.m_pBitmap = pBitmap; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } CFWL_PushButton::CFWL_PushButton() {} CFWL_PushButton::~CFWL_PushButton() {} -FWL_ERR CFWL_PushButton::CFWL_PushButtonDP::GetCaption( +FWL_Error CFWL_PushButton::CFWL_PushButtonDP::GetCaption( IFWL_Widget* pWidget, CFX_WideString& wsCaption) { wsCaption = m_wsCaption; - return FWL_ERR_Succeeded; + return FWL_Error::Succeeded; } CFX_DIBitmap* CFWL_PushButton::CFWL_PushButtonDP::GetPicture( |