More define cleanup.

xfa/fwl/basewidget/fwl_comboboximp.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/basewidget/fwl_comboboximp.h"
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fee/fde_txtedtengine.h"
@@ skipping 141 matching lines @@
       backDefault = FALSE;
       break;
     }
     case CFWL_MessageType::KillFocus: {
       m_pOwner->m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
       backDefault = FALSE;
       break;
     }
     case CFWL_MessageType::Mouse: {
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
-      if ((pMsg->m_dwCmd == FWL_MSGMOUSECMD_LButtonDown) &&
+      if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
           ((m_pOwner->m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
         m_pOwner->SetSelected();
         m_pOwner->SetComboBoxFocus(TRUE);
       }
       break;
     }
     default:
       break;
   }
   if (!backDefault)
@@ skipping 128 matching lines @@
       CFX_RectF rect;
       m_pOwner->m_pVertScrollBar->GetWidgetRect(rect);
       if (rect.Contains(pMsg->m_fx, pMsg->m_fy)) {
         pMsg->m_fx -= rect.left;
         pMsg->m_fy -= rect.top;
         IFWL_WidgetDelegate* pDelegate =
             m_pOwner->m_pVertScrollBar->SetDelegate(NULL);
         return pDelegate->OnProcessMessage(pMsg);
       }
     }
-    uint32_t dwCmd = pMsg->m_dwCmd;
-    switch (dwCmd) {
-      case FWL_MSGMOUSECMD_MouseMove: {
+    switch (pMsg->m_dwCmd) {
+      case FWL_MouseCommand::Move: {
         backDefault = FALSE;
         OnDropListMouseMove(pMsg);
         break;
       }
-      case FWL_MSGMOUSECMD_LButtonDown: {
+      case FWL_MouseCommand::LeftButtonDown: {
         backDefault = FALSE;
         OnDropListLButtonDown(pMsg);
         break;
       }
-      case FWL_MSGMOUSECMD_LButtonUp: {
+      case FWL_MouseCommand::LeftButtonUp: {
         backDefault = FALSE;
         OnDropListLButtonUp(pMsg);
         break;
       }
-      default: {}
+      default:
+        break;
     }
   } else if (dwHashCode == CFWL_MessageType::Key) {
     backDefault = !OnDropListKey(static_cast<CFWL_MsgKey*>(pMessage));
   }
   if (!backDefault)
     return 1;
   return CFWL_ListBoxImpDelegate::OnProcessMessage(pMessage);
 }
 
 void CFWL_ComboListImpDelegate::OnDropListFocusChanged(CFWL_Message* pMsg,
@@ skipping 69 matching lines @@
     if (hItem) {
       pOuter->ProcessSelChanged(TRUE);
     }
   }
   return 1;
 }
 int32_t CFWL_ComboListImpDelegate::OnDropListKey(CFWL_MsgKey* pKey) {
   CFWL_ComboBoxImp* pOuter =
       static_cast<CFWL_ComboBoxImp*>(m_pOwner->m_pOuter->GetImpl());
   FX_BOOL bPropagate = FALSE;
-  if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) {
+  if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
     uint32_t dwKeyCode = pKey->m_dwKeyCode;
     switch (dwKeyCode) {
       case FWL_VKEY_Return:
       case FWL_VKEY_Escape: {
         pOuter->ShowDropList(FALSE);
         return 1;
       }
       case FWL_VKEY_Up:
       case FWL_VKEY_Down: {
         OnDropListKeyDown(pKey);
         pOuter->SetDelegate(nullptr);
         pOuter->ProcessSelChanged(FALSE);
         return 1;
       }
       default: { bPropagate = TRUE; }
     }
-  } else if (pKey->m_dwCmd == FWL_MSGKEYCMD_Char) {
+  } else if (pKey->m_dwCmd == FWL_KeyCommand::Char) {
     bPropagate = TRUE;
   }
   if (bPropagate) {
     pKey->m_pDstTarget = m_pOwner->m_pOuter;
     pOuter->m_pDelegate->OnProcessMessage(pKey);
     return 1;
   }
   return 0;
 }
 void CFWL_ComboListImpDelegate::OnDropListKeyDown(CFWL_MsgKey* pKey) {
@@ skipping 928 matching lines @@
       OnFocusChanged(pMessage, TRUE);
       break;
     }
     case CFWL_MessageType::KillFocus: {
       OnFocusChanged(pMessage, FALSE);
       break;
     }
     case CFWL_MessageType::Mouse: {
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
-        case FWL_MSGMOUSECMD_LButtonDown: {
+        case FWL_MouseCommand::LeftButtonDown: {
           OnLButtonDown(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_LButtonUp: {
+        case FWL_MouseCommand::LeftButtonUp: {
           OnLButtonUp(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_MouseMove: {
+        case FWL_MouseCommand::Move: {
           OnMouseMove(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_MouseLeave: {
+        case FWL_MouseCommand::Leave: {
           OnMouseLeave(pMsg);
           break;
         }
         default:
           break;
       }
       break;
     }
     case CFWL_MessageType::Key: {
       OnKey(static_cast<CFWL_MsgKey*>(pMessage));
@@ skipping 201 matching lines @@
     }
     case CFWL_MessageType::KillFocus: {
       backDefault = FALSE;
       DisForm_OnFocusChanged(pMessage, FALSE);
       break;
     }
     case CFWL_MessageType::Mouse: {
       backDefault = FALSE;
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
-        case FWL_MSGMOUSECMD_LButtonDown: {
+        case FWL_MouseCommand::LeftButtonDown: {
           DisForm_OnLButtonDown(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_LButtonUp: {
+        case FWL_MouseCommand::LeftButtonUp: {
           OnLButtonUp(pMsg);
           break;
         }
         default:
           break;
       }
       break;
     }
     case CFWL_MessageType::Key: {
       backDefault = FALSE;
       CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
-      if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyUp)
+      if (pKey->m_dwCmd == FWL_KeyCommand::KeyUp)
         break;
       if (m_pOwner->DisForm_IsDropListShowed() &&
-          pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown) {
+          pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
         FX_BOOL bListKey = pKey->m_dwKeyCode == FWL_VKEY_Up ||
                            pKey->m_dwKeyCode == FWL_VKEY_Down ||
                            pKey->m_dwKeyCode == FWL_VKEY_Return ||
                            pKey->m_dwKeyCode == FWL_VKEY_Escape;
         if (bListKey) {
           IFWL_WidgetDelegate* pDelegate =
               m_pOwner->m_pListBox->SetDelegate(NULL);
           pDelegate->OnProcessMessage(pMessage);
           break;
         }
@@ skipping 103 matching lines @@
       m_pComboBox(pComboBox) {}
 
 int32_t CFWL_ComboProxyImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
 
   switch (pMessage->GetClassID()) {
     case CFWL_MessageType::Mouse: {
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
-        case FWL_MSGMOUSECMD_LButtonDown: {
+        case FWL_MouseCommand::LeftButtonDown: {
           OnLButtonDown(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_LButtonUp: {
+        case FWL_MouseCommand::LeftButtonUp: {
           OnLButtonUp(pMsg);
           break;
         }
-        case FWL_MSGMOUSECMD_MouseMove: {
+        case FWL_MouseCommand::Move: {
           OnMouseMove(pMsg);
           break;
         }
         default:
           break;
       }
       break;
     }
     case CFWL_MessageType::Deactivate: {
       OnDeactive(static_cast<CFWL_MsgDeactivate*>(pMessage));
@@ skipping 63 matching lines @@
   m_pComboBox->ShowDropList(FALSE);
 }
 void CFWL_ComboProxyImpDelegate::OnFocusChanged(CFWL_MsgKillFocus* pMsg,
                                                 FX_BOOL bSet) {
   if (!bSet) {
     if (pMsg->m_pSetFocus == NULL) {
       m_pComboBox->ShowDropList(FALSE);
     }
   }
 }