Remove CFWL_Note.

xfa/fwl/basewidget/fwl_datetimepickerimp.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_datetimepickerimp.h"
 
 #include "xfa/fwl/basewidget/fwl_editimp.h"
 #include "xfa/fwl/basewidget/fwl_formproxyimp.h"
@@ skipping 147 matching lines @@
   m_pDelegate = new CFWL_DateTimeEditImpDelegate(this);
   if (CFWL_EditImp::Initialize() != FWL_ERR_Succeeded)
     return FWL_ERR_Indefinite;
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_DateTimeEdit::Finalize() {
   delete m_pDelegate;
   m_pDelegate = nullptr;
   return CFWL_EditImp::Finalize();
 }
+
 CFWL_DateTimeEditImpDelegate::CFWL_DateTimeEditImpDelegate(
     CFWL_DateTimeEdit* pOwner)
     : CFWL_EditImpDelegate(pOwner), m_pOwner(pOwner) {}
+
 int32_t CFWL_DateTimeEditImpDelegate::OnProcessMessage(CFWL_Message* pMessage) {
-  if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
+  if (m_pOwner->m_pWidgetMgr->IsFormDisabled())
     return DisForm_OnProcessMessage(pMessage);
-  }
-  uint32_t dwHashCode = pMessage->GetClassID();
-  if (dwHashCode == FWL_MSGHASH_SetFocus ||
-      dwHashCode == FWL_MSGHASH_KillFocus) {
+
+  CFWL_MessageType dwHashCode = pMessage->GetClassID();
+  if (dwHashCode == CFWL_MessageType::SetFocus ||
+      dwHashCode == CFWL_MessageType::KillFocus) {
     IFWL_Widget* pOuter = m_pOwner->GetOuter();
     IFWL_WidgetDelegate* pDelegate = pOuter->SetDelegate(NULL);
     pDelegate->OnProcessMessage(pMessage);
   }
   return 1;
 }
+
 int32_t CFWL_DateTimeEditImpDelegate::DisForm_OnProcessMessage(
     CFWL_Message* pMessage) {
-  uint32_t dwHashCode = pMessage->GetClassID();
+  CFWL_MessageType dwHashCode = pMessage->GetClassID();
   if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
-    if (dwHashCode == FWL_MSGHASH_Mouse) {
+    if (dwHashCode == CFWL_MessageType::Mouse) {
       CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
       if (pMouse->m_dwCmd == FWL_MSGMOUSECMD_LButtonDown ||
           pMouse->m_dwCmd == FWL_MSGMOUSECMD_RButtonDown) {
         if ((m_pOwner->m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0) {
           m_pOwner->m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
         }
         CFWL_DateTimePickerImp* pDateTime =
             static_cast<CFWL_DateTimePickerImp*>(m_pOwner->m_pOuter->GetImpl());
         if (pDateTime->IsMonthCalendarShowed()) {
           CFX_RectF rtInvalidate;
           pDateTime->GetWidgetRect(rtInvalidate);
           pDateTime->ShowMonthCalendar(FALSE);
           rtInvalidate.Offset(-rtInvalidate.left, -rtInvalidate.top);
           pDateTime->Repaint(&rtInvalidate);
         }
       }
-    } else if (dwHashCode == FWL_MSGHASH_Key) {
+    } else if (dwHashCode == CFWL_MessageType::Key) {
       return CFWL_EditImpDelegate::OnProcessMessage(pMessage);
     }
   }
   return CFWL_EditImpDelegate::OnProcessMessage(pMessage);
 }
+
 CFWL_DateTimeCalendar::CFWL_DateTimeCalendar(
     const CFWL_WidgetImpProperties& properties,
     IFWL_Widget* pOuter)
     : CFWL_MonthCalendarImp(properties, pOuter) {}
 FWL_ERR CFWL_DateTimeCalendar::Initialize() {
   if (CFWL_MonthCalendarImp::Initialize() != FWL_ERR_Succeeded)
     return FWL_ERR_Indefinite;
   delete m_pDelegate;
   m_pDelegate = new CFWL_DateTimeCalendarImpDelegate(this);
   return FWL_ERR_Succeeded;
 }
 FWL_ERR CFWL_DateTimeCalendar::Finalize() {
   delete m_pDelegate;
   m_pDelegate = nullptr;
   return CFWL_MonthCalendarImp::Finalize();
 }
+
 CFWL_DateTimeCalendarImpDelegate::CFWL_DateTimeCalendarImpDelegate(
     CFWL_DateTimeCalendar* pOwner)
     : CFWL_MonthCalendarImpDelegate(pOwner), m_pOwner(pOwner) {
   m_bFlag = FALSE;
 }
+
 int32_t CFWL_DateTimeCalendarImpDelegate::OnProcessMessage(
     CFWL_Message* pMessage) {
-  uint32_t dwCode = pMessage->GetClassID();
-  if (dwCode == FWL_MSGHASH_SetFocus || dwCode == FWL_MSGHASH_KillFocus) {
+  CFWL_MessageType dwCode = pMessage->GetClassID();
+  if (dwCode == CFWL_MessageType::SetFocus ||
+      dwCode == CFWL_MessageType::KillFocus) {
     IFWL_Widget* pOuter = m_pOwner->GetOuter();
     IFWL_WidgetDelegate* pDelegate = pOuter->SetDelegate(NULL);
     return pDelegate->OnProcessMessage(pMessage);
-  } else if (dwCode == FWL_MSGHASH_Mouse) {
+  } else if (dwCode == CFWL_MessageType::Mouse) {
     CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
     if (pMsg->m_dwCmd == FWL_MSGMOUSECMD_LButtonDown) {
       OnLButtonDownEx(pMsg);
       return 1;
     } else if (pMsg->m_dwCmd == FWL_MSGMOUSECMD_LButtonUp) {
       OnLButtonUpEx(pMsg);
       return 1;
     }
   }
   return CFWL_MonthCalendarImpDelegate::OnProcessMessage(pMessage);
 }
+
 void CFWL_DateTimeCalendarImpDelegate::OnLButtonDownEx(CFWL_MsgMouse* pMsg) {
   if (m_pOwner->m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_pOwner->m_iLBtnPartStates = FWL_PARTSTATE_MCD_Pressed;
     m_pOwner->PrevMonth();
     m_pOwner->Repaint(&m_pOwner->m_rtClient);
   } else if (m_pOwner->m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_pOwner->m_iRBtnPartStates |= FWL_PARTSTATE_MCD_Pressed;
     m_pOwner->NextMonth();
     m_pOwner->Repaint(&m_pOwner->m_rtClient);
   } else if (m_pOwner->m_rtToday.Contains(pMsg->m_fx, pMsg->m_fy)) {
@@ skipping 96 matching lines @@
     bRepaint = m_pOwner->m_iHovered > 0;
     if (bRepaint) {
       m_pOwner->GetDayRect(m_pOwner->m_iHovered, rtInvalidate);
     }
     m_pOwner->m_iHovered = -1;
   }
   if (bRepaint && !rtInvalidate.IsEmpty()) {
     m_pOwner->Repaint(&rtInvalidate);
   }
 }
+
 int32_t CFWL_DateTimeCalendarImpDelegate::DisForm_OnProcessMessage(
     CFWL_Message* pMessage) {
-  if (pMessage->GetClassID() == FWL_MSGHASH_Mouse) {
+  if (pMessage->GetClassID() == CFWL_MessageType::Mouse) {
     CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
     if (pMsg->m_dwCmd == FWL_MSGMOUSECMD_LButtonUp) {
       DisForm_OnLButtonUpEx(pMsg);
       return 1;
     }
   }
   return CFWL_MonthCalendarImpDelegate::OnProcessMessage(pMessage);
 }
+
 void CFWL_DateTimeCalendarImpDelegate::DisForm_OnLButtonUpEx(
     CFWL_MsgMouse* pMsg) {
   if (m_pOwner->m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_pOwner->m_iLBtnPartStates = 0;
     m_pOwner->Repaint(&(m_pOwner->m_rtLBtn));
     return;
   }
   if (m_pOwner->m_rtRBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_pOwner->m_iRBtnPartStates = 0;
     m_pOwner->Repaint(&(m_pOwner->m_rtRBtn));
@@ skipping 615 matching lines @@
     m_pMonthCal->GetWidgetRect(rtMonth);
     CFX_Matrix mt;
     mt.Set(1, 0, 0, 1, rtMonth.left, rtMonth.top);
     if (pMatrix) {
       mt.Concat(*pMatrix);
     }
     m_pMonthCal->DrawWidget(pGraphics, &mt);
   }
   return FWL_ERR_Succeeded;
 }
+
 CFWL_DateTimePickerImpDelegate::CFWL_DateTimePickerImpDelegate(
     CFWL_DateTimePickerImp* pOwner)
     : m_pOwner(pOwner) {}
+
 int32_t CFWL_DateTimePickerImpDelegate::OnProcessMessage(
     CFWL_Message* pMessage) {
   if (!pMessage)
     return 0;
-  uint32_t dwMsgCode = pMessage->GetClassID();
+
+  CFWL_MessageType dwMsgCode = pMessage->GetClassID();
   switch (dwMsgCode) {
-    case FWL_MSGHASH_SetFocus:
-    case FWL_MSGHASH_KillFocus: {
-      OnFocusChanged(pMessage, dwMsgCode == FWL_MSGHASH_SetFocus);
+    case CFWL_MessageType::SetFocus:

[Tom Sepez, 2016/04/19 18:46:11]

and here.

[dsinclair, 2016/04/19 19:11:25]

Done. dwMsgCode was also used on 1068, but I moved that into a case statement.

+    case CFWL_MessageType::KillFocus: {
+      OnFocusChanged(pMessage, dwMsgCode == CFWL_MessageType::SetFocus);
       break;
     }
-    case FWL_MSGHASH_Mouse: {
+    case CFWL_MessageType::Mouse: {
       CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
       uint32_t dwCmd = pMouse->m_dwCmd;
       switch (dwCmd) {
         case FWL_MSGMOUSECMD_LButtonDown: {
           OnLButtonDown(pMouse);
           break;
         }
         case FWL_MSGMOUSECMD_LButtonUp: {
           OnLButtonUp(pMouse);
           break;
         }
         case FWL_MSGMOUSECMD_MouseMove: {
           OnMouseMove(pMouse);
           break;
         }
         case FWL_MSGMOUSECMD_MouseLeave: {
           OnMouseLeave(pMouse);
           break;
         }
-        default: {}
+        default:
+          break;
       }
       break;
     }
     default:
       break;
   }
-  if (dwMsgCode == FWL_MSGHASH_Key &&
+  if (dwMsgCode == CFWL_MessageType::Key &&
       m_pOwner->m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
     IFWL_WidgetDelegate* pDelegate = m_pOwner->m_pEdit->SetDelegate(NULL);
     return pDelegate->OnProcessMessage(pMessage);
   }
   return CFWL_WidgetImpDelegate::OnProcessMessage(pMessage);
 }
+
 FWL_ERR CFWL_DateTimePickerImpDelegate::OnDrawWidget(
     CFX_Graphics* pGraphics,
     const CFX_Matrix* pMatrix) {
   return m_pOwner->DrawWidget(pGraphics, pMatrix);
 }
 void CFWL_DateTimePickerImpDelegate::OnFocusChanged(CFWL_Message* pMsg,
                                                     FX_BOOL bSet) {
   if (!pMsg)
     return;
   if (m_pOwner->m_pWidgetMgr->IsFormDisabled()) {
@@ skipping 83 matching lines @@
     }
     if (m_pOwner->m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
       pMsg->m_pSrcTarget = m_pOwner->m_pEdit.get();
       IFWL_WidgetDelegate* pDelegate = m_pOwner->m_pEdit->SetDelegate(NULL);
       pDelegate->OnProcessMessage(pMsg);
     }
   }
   rtInvalidate.Inflate(2, 2);
   m_pOwner->Repaint(&rtInvalidate);
 }