diff options
author | dsinclair <dsinclair@chromium.org> | 2016-04-21 13:12:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-04-21 13:12:06 -0700 |
commit | 5d9da0c1255a75dd9b7b2005f8b7d6ae4948feaf (patch) | |
tree | df40bedc2582cab695e7bf4b2056bfddd4969908 /xfa/fwl/basewidget/fwl_checkboximp.cpp | |
parent | 0f6425fff33e4096b4e1fbfb954edae1349c0145 (diff) | |
download | pdfium-5d9da0c1255a75dd9b7b2005f8b7d6ae4948feaf.tar.xz |
Remove CFWL_Note.
This CL removes the CFWL_Note class. The two subclasses, CFWL_Event and
CFWL_Message are distinct types and should not be related by the subclass. The
code has been updated to pass the correct types as needed.
The various FWL_EVTHASH and FWL_MSGHASH defines have all been removed and turned
into an FWL_EventType and FWL_MessageType enum classes.
BUG=pdfium:474
Review URL: https://codereview.chromium.org/1901183002
Diffstat (limited to 'xfa/fwl/basewidget/fwl_checkboximp.cpp')
-rw-r--r-- | xfa/fwl/basewidget/fwl_checkboximp.cpp | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/xfa/fwl/basewidget/fwl_checkboximp.cpp b/xfa/fwl/basewidget/fwl_checkboximp.cpp index 9ed2f0b8ed..e511b8e444 100644 --- a/xfa/fwl/basewidget/fwl_checkboximp.cpp +++ b/xfa/fwl/basewidget/fwl_checkboximp.cpp @@ -409,22 +409,26 @@ 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(); + int32_t iRet = 1; - switch (dwMsgCode) { - case FWL_MSGHASH_Activate: { + switch (pMessage->GetClassID()) { + 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: { + OnFocusChanged(pMessage, TRUE); break; } - case FWL_MSGHASH_Mouse: { + case CFWL_MessageType::KillFocus: { + OnFocusChanged(pMessage, FALSE); + break; + } + case CFWL_MessageType::Mouse: { CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage); uint32_t dwCmd = pMsg->m_dwCmd; switch (dwCmd) { @@ -444,19 +448,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; } |