Chromium Code Reviews| Index: xfa/fwl/basewidget/fwl_pushbuttonimp.cpp |
| diff --git a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp |
| index 92f0ca11d27b406b6c5e75b5cbbc109ba27291e3..1ca0f7843e0164048aa04d680b5c35d5447e2217 100644 |
| --- a/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp |
| +++ b/xfa/fwl/basewidget/fwl_pushbuttonimp.cpp |
| @@ -398,24 +398,26 @@ void CFWL_PushButtonImp::UpdateTextOutStyles() { |
| m_dwTTOStyles |= FDE_TTOSTYLE_RTL; |
| } |
| } |
| + |
| CFWL_PushButtonImpDelegate::CFWL_PushButtonImpDelegate( |
| CFWL_PushButtonImp* pOwner) |
| : m_pOwner(pOwner) {} |
| + |
| int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { |
| if (!pMessage) |
| return 0; |
| - if (!m_pOwner->IsEnabled()) { |
| + if (!m_pOwner->IsEnabled()) |
| return 1; |
| - } |
| + |
| int32_t iRet = 1; |
| - uint32_t dwMsgCode = pMessage->GetClassID(); |
| + CFWL_MessageType dwMsgCode = pMessage->GetClassID(); |
| switch (dwMsgCode) { |
| - case FWL_MSGHASH_SetFocus: |
| - case FWL_MSGHASH_KillFocus: { |
| - OnFocusChanged(pMessage, dwMsgCode == FWL_MSGHASH_SetFocus); |
| + case CFWL_MessageType::SetFocus: |
| + case CFWL_MessageType::KillFocus: { |
| + OnFocusChanged(pMessage, dwMsgCode == CFWL_MessageType::SetFocus); |
|
Tom Sepez
2016/04/21 19:22:33
missed a third.
dsinclair
2016/04/21 19:35:49
Done.
|
| break; |
| } |
| - case FWL_MSGHASH_Mouse: { |
| + case CFWL_MessageType::Mouse: { |
| CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); |
| uint32_t dwCmd = pMsg->m_dwCmd; |
| switch (dwCmd) { |
| @@ -435,15 +437,15 @@ int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { |
| OnMouseLeave(pMsg); |
| break; |
| } |
| - default: {} |
| + default: |
| + break; |
| } |
| break; |
| } |
| - case FWL_MSGHASH_Key: { |
| + case CFWL_MessageType::Key: { |
| CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage); |
| - if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) { |
| + if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) |
| OnKeyDown(pKey); |
| - } |
| break; |
| } |
| default: { |
| @@ -454,6 +456,7 @@ int32_t CFWL_PushButtonImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { |
| CFWL_WidgetImpDelegate::OnProcessMessage(pMessage); |
| return iRet; |
| } |
| + |
| FWL_ERR CFWL_PushButtonImpDelegate::OnProcessEvent(CFWL_Event* pEvent) { |
| return FWL_ERR_Succeeded; |
| } |