More define cleanup.

xfa/fwl/basewidget/fwl_checkboximp.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_checkboximp.h"
 
 #include <algorithm>
 
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/basewidget/ifwl_checkbox.h"
 #include "xfa/fwl/core/cfwl_message.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
-#define FWL_CKB_CaptionMargin 5
+namespace {
+
+const int kCaptionMargin = 5;
+
+}  // namespace
 
 // static
 IFWL_CheckBox* IFWL_CheckBox::Create(const CFWL_WidgetImpProperties& properties,
                                      IFWL_Widget* pOuter) {
   IFWL_CheckBox* pCheckBox = new IFWL_CheckBox;
   CFWL_CheckBoxImp* pCheckBoxImpl = new CFWL_CheckBoxImp(properties, pOuter);
   pCheckBox->SetImpl(pCheckBoxImpl);
   pCheckBoxImpl->SetInterface(pCheckBox);
   return pCheckBox;
 }
@@ skipping 45 matching lines @@
     if (!m_pProperties->m_pDataProvider)
       return FWL_ERR_Indefinite;
     CFX_WideString wsCaption;
     m_pProperties->m_pDataProvider->GetCaption(m_pInterface, wsCaption);
     if (wsCaption.GetLength() > 0) {
       CFX_SizeF sz = CalcTextSize(
           wsCaption, m_pProperties->m_pThemeProvider,
           m_pProperties->m_dwStyleExes & FWL_STYLEEXT_CKB_MultiLine);
       rect.Set(0, 0, sz.x, sz.y);
     }
-    rect.Inflate(FWL_CKB_CaptionMargin, FWL_CKB_CaptionMargin);
+    rect.Inflate(kCaptionMargin, kCaptionMargin);
     IFWL_CheckBoxDP* pData =
         static_cast<IFWL_CheckBoxDP*>(m_pProperties->m_pDataProvider);
     FX_FLOAT fCheckBox = pData->GetBoxSize(m_pInterface);
     rect.width += fCheckBox;
     if (rect.height < fCheckBox) {
       rect.height = fCheckBox;
     }
     CFWL_WidgetImp::GetWidgetRect(rect, TRUE);
   } else {
     rect = m_pProperties->m_rtWidget;
@@ skipping 136 matching lines @@
     fBoxLeft = fClientRight - fCheckBox;
     fTextLeft = m_rtClient.left;
     fTextRight = fBoxLeft;
   } else {
     fTextLeft = fBoxLeft + fCheckBox;
     fTextRight = fClientRight;
   }
   m_rtBox.Set(fBoxLeft, fBoxTop, fCheckBox, fCheckBox);
   m_rtCaption.Set(fTextLeft, m_rtClient.top, fTextRight - fTextLeft,
                   m_rtClient.height);
-  m_rtCaption.Inflate(-FWL_CKB_CaptionMargin, -FWL_CKB_CaptionMargin);
+  m_rtCaption.Inflate(-kCaptionMargin, -kCaptionMargin);
   CFX_RectF rtFocus;
   rtFocus.Set(m_rtCaption.left, m_rtCaption.top, m_rtCaption.width,
               m_rtCaption.height);
   CFX_WideString wsCaption;
   m_pProperties->m_pDataProvider->GetCaption(m_pInterface, wsCaption);
   if (wsCaption.IsEmpty()) {
     m_rtFocus.Set(0, 0, 0, 0);
   } else {
     CalcTextRect(wsCaption, m_pProperties->m_pThemeProvider, m_dwTTOStyles,
                  m_iTTOAlign, rtFocus);
@@ skipping 167 matching lines @@
     case CFWL_MessageType::SetFocus: {
       OnFocusChanged(pMessage, TRUE);
       break;
     }
     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) {
-        case FWL_MSGMOUSECMD_LButtonDown: {
+      switch (pMsg->m_dwCmd) {
+        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: {
       CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
-      if (pKey->m_dwCmd == FWL_MSGKEYCMD_KeyDown)
+      if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
     }
     default: {
       iRet = 0;
       break;
     }
   }
 
   CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
@@ skipping 88 matching lines @@
 void CFWL_CheckBoxImpDelegate::OnKeyDown(CFWL_MsgKey* pMsg) {
   if (pMsg->m_dwKeyCode == FWL_VKEY_Tab) {
     m_pOwner->DispatchKeyEvent(pMsg);
     return;
   }
   if (pMsg->m_dwKeyCode == FWL_VKEY_Return ||
       pMsg->m_dwKeyCode == FWL_VKEY_Space) {
     m_pOwner->NextStates();
   }
 }