Index: xfa/fwl/basewidget/fwl_checkboximp.cpp |
diff --git a/xfa/fwl/basewidget/fwl_checkboximp.cpp b/xfa/fwl/basewidget/fwl_checkboximp.cpp |
index d2d149ffd41e84fcdc6c14a341653e4bde0ff2e7..3d409d5ae179522ce877b307b49da517e16b15ba 100644 |
--- a/xfa/fwl/basewidget/fwl_checkboximp.cpp |
+++ b/xfa/fwl/basewidget/fwl_checkboximp.cpp |
@@ -409,22 +409,24 @@ void CFWL_CheckBoxImp::NextStates() { |
} |
CFWL_CheckBoxImpDelegate::CFWL_CheckBoxImpDelegate(CFWL_CheckBoxImp* pOwner) |
: m_pOwner(pOwner) {} |
+ |
int32_t CFWL_CheckBoxImpDelegate::OnProcessMessage(CFWL_Message* pMessage) { |
if (!pMessage) |
return 0; |
- uint32_t dwMsgCode = pMessage->GetClassID(); |
+ |
+ CFWL_MessageType dwMsgCode = pMessage->GetClassID(); |
int32_t iRet = 1; |
switch (dwMsgCode) { |
- case FWL_MSGHASH_Activate: { |
+ case CFWL_MessageType::Activate: { |
OnActivate(pMessage); |
break; |
} |
- case FWL_MSGHASH_SetFocus: |
- case FWL_MSGHASH_KillFocus: { |
- OnFocusChanged(pMessage, dwMsgCode == FWL_MSGHASH_SetFocus); |
+ case CFWL_MessageType::SetFocus: |
Tom Sepez
2016/04/19 18:46:11
nit: If we split these out into separate calls wit
dsinclair
2016/04/19 19:11:25
Done.
|
+ case CFWL_MessageType::KillFocus: { |
+ OnFocusChanged(pMessage, dwMsgCode == CFWL_MessageType::SetFocus); |
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) { |
@@ -444,19 +446,23 @@ int32_t CFWL_CheckBoxImpDelegate::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: { iRet = 0; } |
+ default: { |
+ iRet = 0; |
+ break; |
+ } |
} |
+ |
CFWL_WidgetImpDelegate::OnProcessMessage(pMessage); |
return iRet; |
} |