Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_spinbutton.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/cfwl_spinbutton.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_evtclick.h"
+#include "xfa/fwl/core/cfwl_event.h"
 #include "xfa/fwl/core/cfwl_msgkey.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_timerinfo.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 
 namespace {
 
@@ skipping 130 matching lines @@
     params.m_matrix.Concat(*pMatrix);
 
   params.m_rtPart = m_rtDnButton;
   pTheme->DrawBackground(&params);
 }
 
 void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
   if (!pMessage)
     return;
 
-  CFWL_MessageType dwMsgCode = pMessage->GetClassID();
-  switch (dwMsgCode) {
-    case CFWL_MessageType::SetFocus: {
+  switch (pMessage->GetType()) {
+    case CFWL_Message::Type::SetFocus: {
       OnFocusChanged(pMessage, true);
       break;
     }
-    case CFWL_MessageType::KillFocus: {
+    case CFWL_Message::Type::KillFocus: {
       OnFocusChanged(pMessage, false);
       break;
     }
-    case CFWL_MessageType::Mouse: {
+    case CFWL_Message::Type::Mouse: {
       CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
           break;
         case FWL_MouseCommand::LeftButtonUp:
           OnLButtonUp(pMsg);
           break;
         case FWL_MouseCommand::Move:
           OnMouseMove(pMsg);
           break;
         case FWL_MouseCommand::Leave:
           OnMouseLeave(pMsg);
           break;
         default:
           break;
       }
       break;
     }
-    case CFWL_MessageType::Key: {
+    case CFWL_Message::Type::Key: {
       CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
     }
     default:
       break;
   }
   CFWL_Widget::OnProcessMessage(pMessage);
 }
@@ skipping 25 matching lines @@
     return;
   if (bUpPress) {
     m_iButtonIndex = 0;
     m_dwUpState = CFWL_PartState_Pressed;
   }
   if (bDnPress) {
     m_iButtonIndex = 1;
     m_dwDnState = CFWL_PartState_Pressed;
   }
 
-  CFWL_EvtClick wmPosChanged;
-  wmPosChanged.m_pSrcTarget = this;
+  CFWL_Event wmPosChanged(CFWL_Event::Type::Click, this);
   DispatchEvent(&wmPosChanged);
 
   Repaint(bUpPress ? &m_rtUpButton : &m_rtDnButton);
   m_pTimerInfo = m_Timer.StartTimer(kElapseTime, true);
 }
 
 void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   if (m_pProperties->m_dwStates & CFWL_PartState_Disabled)
     return;
 
@@ skipping 100 matching lines @@
   bool bDown =
       pMsg->m_dwKeyCode == FWL_VKEY_Down || pMsg->m_dwKeyCode == FWL_VKEY_Right;
   if (!bUp && !bDown)
     return;
 
   bool bUpEnable = IsButtonEnabled(true);
   bool bDownEnable = IsButtonEnabled(false);
   if (!bUpEnable && !bDownEnable)
     return;
 
-  CFWL_EvtClick wmPosChanged;
-  wmPosChanged.m_pSrcTarget = this;
+  CFWL_Event wmPosChanged(CFWL_Event::Type::Click, this);
   DispatchEvent(&wmPosChanged);
 
   Repaint(bUpEnable ? &m_rtUpButton : &m_rtDnButton);
 }
 
 CFWL_SpinButton::Timer::Timer(CFWL_SpinButton* pToolTip)
     : CFWL_Timer(pToolTip) {}
 
 void CFWL_SpinButton::Timer::Run(CFWL_TimerInfo* pTimerInfo) {
   CFWL_SpinButton* pButton = static_cast<CFWL_SpinButton*>(m_pWidget);
 
   if (!pButton->m_pTimerInfo)
     return;
 
-  CFWL_EvtClick wmPosChanged;
-  wmPosChanged.m_pSrcTarget = pButton;
+  CFWL_Event wmPosChanged(CFWL_Event::Type::Click, pButton);
   pButton->DispatchEvent(&wmPosChanged);
 }