More define cleanup.

xfa/fwl/core/fwl_noteimp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/fwl_noteimp.h"
 
 #include "core/fxcrt/include/fx_ext.h"
 #include "xfa/fwl/basewidget/fwl_tooltipctrlimp.h"
@@ skipping 72 matching lines @@
   delete m_pNoteLoop;
   ClearInvalidEventTargets(TRUE);
 }
 
 FX_BOOL CFWL_NoteDriver::SendEvent(CFWL_Event* pNote) {
   int32_t iCount = m_eventTargets.GetCount();
   if (iCount < 1)
     return TRUE;
   if (CFWL_EventType::Mouse == pNote->GetClassID()) {
     CFWL_EvtMouse* pMouse = static_cast<CFWL_EvtMouse*>(pNote);
-    if (FWL_MSGMOUSECMD_MouseHover == pMouse->m_dwCmd) {
+    if (FWL_MouseCommand::Hover == pMouse->m_dwCmd) {
       if (m_pNoteLoop->GetForm() &&
           CFWL_ToolTipContainer::getInstance()->ProcessEnter(
               pMouse, m_pNoteLoop->GetForm()->GetInterface())) {
       }
-    } else if (FWL_MSGMOUSECMD_MouseLeave == pMouse->m_dwCmd) {
+    } else if (FWL_MouseCommand::Leave == pMouse->m_dwCmd) {
       CFWL_ToolTipContainer::getInstance()->ProcessLeave(pMouse);
-    } else if ((FWL_MSGMOUSECMD_LButtonDown <= pMouse->m_dwCmd) &&
-               (FWL_MSGMOUSECMD_MButtonDblClk >= pMouse->m_dwCmd)) {
+    } else if ((FWL_MouseCommand::LeftButtonDown <= pMouse->m_dwCmd) &&
+               (FWL_MouseCommand::MiddleButtonDblClk >= pMouse->m_dwCmd)) {
       CFWL_ToolTipContainer::getInstance()->ProcessLeave(pMouse);
     }
   }
   m_sendEventCalled++;
   FX_POSITION pos = m_eventTargets.GetStartPosition();
   while (pos) {
     void* key = nullptr;
     void* value = nullptr;
     m_eventTargets.GetNextAssoc(pos, key, value);
 
@@ skipping 417 matching lines @@
       if (m_pFocus == pMsg->m_pDstTarget) {
         m_pFocus = NULL;
         return TRUE;
       }
     }
   }
   return FALSE;
 }
 FX_BOOL CFWL_NoteDriver::DoKey(CFWL_MsgKey* pMsg, IFWL_Widget* pMessageForm) {
 #if (_FX_OS_ != _FX_MACOSX_)
-  if (pMsg->m_dwCmd == FWL_MSGKEYCMD_KeyDown &&
+  if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
       pMsg->m_dwKeyCode == FWL_VKEY_Tab) {
     CFWL_WidgetMgr* pWidgetMgr =
         static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
     IFWL_Widget* pForm = GetMessageForm(pMsg->m_pDstTarget);
     IFWL_Widget* pFocus = m_pFocus;
     if (m_pFocus) {
       if (pWidgetMgr->GetWidget(m_pFocus, FWL_WGTRELATION_SystemForm) !=
           pForm) {
         pFocus = NULL;
       }
     }
     FX_BOOL bFind = FALSE;
     IFWL_Widget* pNextTabStop = pWidgetMgr->nextTab(pForm, pFocus, bFind);
     if (!pNextTabStop) {
       bFind = FALSE;
       pNextTabStop = pWidgetMgr->nextTab(pForm, NULL, bFind);
     }
     if (pNextTabStop == pFocus) {
       return TRUE;
     }
     if (pNextTabStop) {
       SetFocus(pNextTabStop);
     }
     return TRUE;
   }
 #endif
   if (!m_pFocus) {
-    if (pMsg->m_dwCmd == FWL_MSGKEYCMD_KeyDown &&
+    if (pMsg->m_dwCmd == FWL_KeyCommand::KeyDown &&
         pMsg->m_dwKeyCode == FWL_VKEY_Return) {
       CFWL_WidgetMgr* pWidgetMgr =
           static_cast<CFWL_WidgetMgr*>(FWL_GetWidgetMgr());
       IFWL_Widget* defButton = pWidgetMgr->GetDefaultButton(pMessageForm);
       if (defButton) {
         pMsg->m_pDstTarget = defButton;
         return TRUE;
       }
     }
     return FALSE;
   }
   pMsg->m_pDstTarget = m_pFocus;
   return TRUE;
 }
 FX_BOOL CFWL_NoteDriver::DoMouse(CFWL_MsgMouse* pMsg,
                                  IFWL_Widget* pMessageForm) {
-  if (pMsg->m_dwCmd == FWL_MSGMOUSECMD_MouseLeave ||
-      pMsg->m_dwCmd == FWL_MSGMOUSECMD_MouseHover ||
-      pMsg->m_dwCmd == FWL_MSGMOUSECMD_MouseEnter) {
+  if (pMsg->m_dwCmd == FWL_MouseCommand::Leave ||
+      pMsg->m_dwCmd == FWL_MouseCommand::Hover ||
+      pMsg->m_dwCmd == FWL_MouseCommand::Enter) {
     return pMsg->m_pDstTarget != NULL;
   }
   if (pMsg->m_pDstTarget != pMessageForm) {
     pMsg->m_pDstTarget->TransformTo(pMessageForm, pMsg->m_fx, pMsg->m_fy);
   }
   if (!DoMouseEx(pMsg, pMessageForm)) {
     pMsg->m_pDstTarget = pMessageForm;
   }
   return TRUE;
 }
@@ skipping 55 matching lines @@
   if (pTarget == m_pHover) {
     return;
   }
   if (m_pHover) {
     CFWL_MsgMouse msLeave;
     msLeave.m_pDstTarget = m_pHover;
     msLeave.m_fx = pMsg->m_fx;
     msLeave.m_fy = pMsg->m_fy;
     pTarget->TransformTo(m_pHover, msLeave.m_fx, msLeave.m_fy);
     msLeave.m_dwFlags = 0;
-    msLeave.m_dwCmd = FWL_MSGMOUSECMD_MouseLeave;
+    msLeave.m_dwCmd = FWL_MouseCommand::Leave;
     DispatchMessage(&msLeave, NULL);
   }
   if (pTarget->GetClassID() == FWL_CLASSHASH_Form) {
     m_pHover = NULL;
     return;
   }
   m_pHover = pTarget;
   CFWL_MsgMouse msHover;
   msHover.m_pDstTarget = pTarget;
   msHover.m_fx = pMsg->m_fx;
   msHover.m_fy = pMsg->m_fy;
   msHover.m_dwFlags = 0;
-  msHover.m_dwCmd = FWL_MSGMOUSECMD_MouseHover;
+  msHover.m_dwCmd = FWL_MouseCommand::Hover;
   DispatchMessage(&msHover, NULL);
 }
 FX_BOOL CFWL_NoteDriver::IsValidMessage(CFWL_Message* pMessage) {
   if (pMessage->GetClassID() == CFWL_MessageType::Post)
     return TRUE;
 
   int32_t iCount = m_noteLoopQueue.GetSize();
   for (int32_t i = 0; i < iCount; i++) {
     CFWL_NoteLoop* pNoteLoop = static_cast<CFWL_NoteLoop*>(m_noteLoopQueue[i]);
     CFWL_WidgetImp* pForm = pNoteLoop->GetForm();
@@ skipping 282 matching lines @@
   if (HasToolTip(pEvt->m_pDstTarget) && NULL != m_pToolTipImp) {
     m_pToolTipImp->Hide();
     pCurTarget = NULL;
     return TRUE;
   }
   return FALSE;
 }
 IFWL_ToolTipTarget* CFWL_ToolTipContainer::GetCurrentToolTipTarget() {
   return pCurTarget;
 }