From b4d40ffae3f955fab2fac838430c89aca452c45f Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 5 May 2016 10:28:02 -0700 Subject: Remove CLASSHASH defines in favour of an enum class. This Cl updates all the CLASSHASH defines to use an enum class. A few defines where unabled and were either updated or removed if the number no longer exists in the code base. Review-Url: https://codereview.chromium.org/1946213003 --- xfa/fwl/core/fwl_noteimp.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'xfa/fwl/core/fwl_noteimp.cpp') diff --git a/xfa/fwl/core/fwl_noteimp.cpp b/xfa/fwl/core/fwl_noteimp.cpp index 560dc3c535..5cb66efed6 100644 --- a/xfa/fwl/core/fwl_noteimp.cpp +++ b/xfa/fwl/core/fwl_noteimp.cpp @@ -426,7 +426,8 @@ FX_BOOL CFWL_NoteDriver::DoDeactivate(CFWL_MsgDeactivate* pMsg, pMsg->m_pSrcTarget->IsInstance(FX_WSTRC(L"FWL_FORMPROXY"))) { return FALSE; } - if (pMsg->m_pSrcTarget && pMsg->m_pSrcTarget->GetClassID() == 1111984755) { + if (pMsg->m_pSrcTarget && + pMsg->m_pSrcTarget->GetClassID() == FWL_Type::ToolTip) { return FALSE; } return TRUE; @@ -616,10 +617,10 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_MsgMouse* pMsg) { pTarget->TransformTo(m_pHover, msLeave.m_fx, msLeave.m_fy); msLeave.m_dwFlags = 0; msLeave.m_dwCmd = FWL_MouseCommand::Leave; - DispatchMessage(&msLeave, NULL); + DispatchMessage(&msLeave, nullptr); } - if (pTarget->GetClassID() == FWL_CLASSHASH_Form) { - m_pHover = NULL; + if (pTarget->GetClassID() == FWL_Type::Form) { + m_pHover = nullptr; return; } m_pHover = pTarget; @@ -629,7 +630,7 @@ void CFWL_NoteDriver::MouseSecondary(CFWL_MsgMouse* pMsg) { msHover.m_fy = pMsg->m_fy; msHover.m_dwFlags = 0; msHover.m_dwCmd = FWL_MouseCommand::Hover; - DispatchMessage(&msHover, NULL); + DispatchMessage(&msHover, nullptr); } FX_BOOL CFWL_NoteDriver::IsValidMessage(CFWL_Message* pMessage) { if (pMessage->GetClassID() == CFWL_MessageType::Post) -- cgit v1.2.3