Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_checkbox.cpp

Index: xfa/fwl/core/cfwl_checkbox.cpp
diff --git a/xfa/fwl/core/cfwl_checkbox.cpp b/xfa/fwl/core/cfwl_checkbox.cpp
index cdd8211b60ec31cfda939a4a9b510e8f53393036..a1485cf85eacb414b1b7b6530b16dbc164550987 100644
--- a/xfa/fwl/core/cfwl_checkbox.cpp
+++ b/xfa/fwl/core/cfwl_checkbox.cpp
@@ -13,7 +13,7 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_evtcheckstatechanged.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"
@@ -339,7 +339,7 @@ void CFWL_CheckBox::NextStates() {
   if (dwFirststate == m_pProperties->m_dwStates)
     return;
 
-  CFWL_EvtCheckStateChanged wmCheckBoxState;
+  CFWL_Event wmCheckBoxState(CFWL_EventType::CheckStateChanged);
   wmCheckBoxState.m_pSrcTarget = this;
   DispatchEvent(&wmCheckBoxState);
 }
@@ -474,10 +474,8 @@ void CFWL_CheckBox::OnMouseLeave() {
 }
 
 void CFWL_CheckBox::OnKeyDown(CFWL_MsgKey* pMsg) {
-  if (pMsg->m_dwKeyCode == FWL_VKEY_Tab) {
-    DispatchKeyEvent(pMsg);
+  if (pMsg->m_dwKeyCode == FWL_VKEY_Tab)
     return;
-  }
   if (pMsg->m_dwKeyCode == FWL_VKEY_Return ||
       pMsg->m_dwKeyCode == FWL_VKEY_Space) {
     NextStates();