Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_form.cpp

Index: xfa/fwl/core/cfwl_form.cpp
diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/core/cfwl_form.cpp
index 4eec16390010b69524554934f58f8081f30ee301..7c086a173c1135896a0ccc215bb8cedf496cc8c4 100644
--- a/xfa/fwl/core/cfwl_form.cpp
+++ b/xfa/fwl/core/cfwl_form.cpp
@@ -11,7 +11,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_evtclose.h"
+#include "xfa/fwl/core/cfwl_event.h"
 #include "xfa/fwl/core/cfwl_formproxy.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/cfwl_notedriver.h"
@@ -556,7 +556,7 @@ void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     }
     m_bMaximized = !m_bMaximized;
   } else if (pPressedBtn != m_pMinBox) {
-    CFWL_EvtClose eClose;
+    CFWL_Event eClose(CFWL_EventType::Close);
     eClose.m_pSrcTarget = this;
     DispatchEvent(&eClose);
   }