| Index: xfa/fwl/basewidget/fwl_pushbuttonimp.cpp
|
| diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp
|
| index b1e5f6bdb41a921f822adfa6f1a71440f0bb4fa1..8c12d090e4aa948e926319975c36d92f4ade4a86 100644
|
| --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp
|
| +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp
|
| @@ -39,25 +39,26 @@ CFWL_PushButtonImp::CFWL_PushButtonImp(
|
| m_rtCaption.Set(0, 0, 0, 0);
|
| }
|
| CFWL_PushButtonImp::~CFWL_PushButtonImp() {}
|
| -FWL_ERR CFWL_PushButtonImp::GetClassName(CFX_WideString& wsClass) const {
|
| +FWL_Error CFWL_PushButtonImp::GetClassName(CFX_WideString& wsClass) const {
|
| wsClass = FWL_CLASS_PushButton;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| uint32_t CFWL_PushButtonImp::GetClassID() const {
|
| return FWL_CLASSHASH_PushButton;
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::Initialize() {
|
| - if (CFWL_WidgetImp::Initialize() != FWL_ERR_Succeeded)
|
| - return FWL_ERR_Indefinite;
|
| +FWL_Error CFWL_PushButtonImp::Initialize() {
|
| + if (CFWL_WidgetImp::Initialize() != FWL_Error::Succeeded)
|
| + return FWL_Error::Indefinite;
|
| m_pDelegate = new CFWL_PushButtonImpDelegate(this);
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::Finalize() {
|
| +FWL_Error CFWL_PushButtonImp::Finalize() {
|
| delete m_pDelegate;
|
| m_pDelegate = nullptr;
|
| return CFWL_WidgetImp::Finalize();
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
|
| +FWL_Error CFWL_PushButtonImp::GetWidgetRect(CFX_RectF& rect,
|
| + FX_BOOL bAutoSize) {
|
| if (bAutoSize) {
|
| rect.Set(0, 0, 0, 0);
|
| if (m_pProperties->m_pThemeProvider == NULL) {
|
| @@ -81,18 +82,18 @@ FWL_ERR CFWL_PushButtonImp::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
|
| } else {
|
| rect = m_pProperties->m_rtWidget;
|
| }
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::SetStates(uint32_t dwStates, FX_BOOL bSet) {
|
| +FWL_Error CFWL_PushButtonImp::SetStates(uint32_t dwStates, FX_BOOL bSet) {
|
| if ((dwStates & FWL_WGTSTATE_Disabled) && bSet) {
|
| m_pProperties->m_dwStates = FWL_WGTSTATE_Disabled;
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| return CFWL_WidgetImp::SetStates(dwStates, bSet);
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::Update() {
|
| +FWL_Error CFWL_PushButtonImp::Update() {
|
| if (IsLocked()) {
|
| - return FWL_ERR_Indefinite;
|
| + return FWL_Error::Indefinite;
|
| }
|
| if (!m_pProperties->m_pThemeProvider) {
|
| m_pProperties->m_pThemeProvider = GetAvailableTheme();
|
| @@ -103,14 +104,14 @@ FWL_ERR CFWL_PushButtonImp::Update() {
|
| FX_FLOAT* fcaption =
|
| static_cast<FX_FLOAT*>(GetThemeCapacity(CFWL_WidgetCapacity::Margin));
|
| m_rtCaption.Inflate(-*fcaption, -*fcaption);
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| -FWL_ERR CFWL_PushButtonImp::DrawWidget(CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix) {
|
| +FWL_Error CFWL_PushButtonImp::DrawWidget(CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix) {
|
| if (!pGraphics)
|
| - return FWL_ERR_Indefinite;
|
| + return FWL_Error::Indefinite;
|
| if (!m_pProperties->m_pThemeProvider)
|
| - return FWL_ERR_Indefinite;
|
| + return FWL_Error::Indefinite;
|
| IFWL_PushButtonDP* pData =
|
| static_cast<IFWL_PushButtonDP*>(m_pProperties->m_pDataProvider);
|
| CFX_DIBitmap* pPicture = NULL;
|
| @@ -291,7 +292,7 @@ FWL_ERR CFWL_PushButtonImp::DrawWidget(CFX_Graphics* pGraphics,
|
| DrawText(pGraphics, m_pProperties->m_pThemeProvider, &matrix);
|
| break;
|
| }
|
| - return FWL_ERR_Succeeded;
|
| + return FWL_Error::Succeeded;
|
| }
|
| void CFWL_PushButtonImp::DrawBkground(CFX_Graphics* pGraphics,
|
| IFWL_ThemeProvider* pTheme,
|
| @@ -402,13 +403,12 @@ CFWL_PushButtonImpDelegate::CFWL_PushButtonImpDelegate(
|
| CFWL_PushButtonImp* pOwner)
|
| : m_pOwner(pOwner) {}
|
|
|
| -int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
|
| +void CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
|
| if (!pMessage)
|
| - return 0;
|
| + return;
|
| if (!m_pOwner->IsEnabled())
|
| - return 1;
|
| + return;
|
|
|
| - int32_t iRet = 1;
|
| CFWL_MessageType dwMsgCode = pMessage->GetClassID();
|
| switch (dwMsgCode) {
|
| case CFWL_MessageType::SetFocus: {
|
| @@ -450,21 +450,19 @@ int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
|
| break;
|
| }
|
| default: {
|
| - iRet = 0;
|
| break;
|
| }
|
| }
|
| CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
|
| - return iRet;
|
| }
|
|
|
| -FWL_ERR CFWL_PushButtonImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {
|
| - return FWL_ERR_Succeeded;
|
| -}
|
| -FWL_ERR CFWL_PushButtonImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
|
| - const CFX_Matrix* pMatrix) {
|
| - return m_pOwner->DrawWidget(pGraphics, pMatrix);
|
| +void CFWL_PushButtonImpDelegate::OnProcessEvent(CFWL_Event* pEvent) {}
|
| +
|
| +void CFWL_PushButtonImpDelegate::OnDrawWidget(CFX_Graphics* pGraphics,
|
| + const CFX_Matrix* pMatrix) {
|
| + m_pOwner->DrawWidget(pGraphics, pMatrix);
|
| }
|
| +
|
| void CFWL_PushButtonImpDelegate::OnFocusChanged(CFWL_Message* pMsg,
|
| FX_BOOL bSet) {
|
| if (bSet) {
|
|
|