Cleanup FWL Event and Message code.

xfa/fwl/core/cfwl_event.h

Index: xfa/fwl/core/cfwl_event.h
diff --git a/xfa/fwl/core/cfwl_event.h b/xfa/fwl/core/cfwl_event.h
index fe8e1b37f0eaf1d50857734d995a3798329b1974..aa435e54b22bbf503ce216835791a1fe01c4539e 100644
--- a/xfa/fwl/core/cfwl_event.h
+++ b/xfa/fwl/core/cfwl_event.h
@@ -14,41 +14,39 @@
 #include "xfa/fwl/core/cfwl_msgmouse.h"
 #include "xfa/fwl/core/fwl_error.h"
 
-enum class CFWL_EventType {
-  None = 0,
-
-  CheckStateChanged,
-  CheckWord,
-  Click,
-  Close,
-  EditChanged,
-  Key,
-  KillFocus,
-  Mouse,
-  MouseWheel,
-  PostDropDown,
-  PreDropDown,
-  Scroll,
-  SelectChanged,
-  SetFocus,
-  SizeChanged,
-  TextChanged,
-  TextFull,
-  Validate
-};
-
 class CFX_Graphics;
 class CFWL_Widget;
 
 class CFWL_Event {
  public:
-  CFWL_Event();
+  enum class Type {

[Tom Sepez, 2016/12/08 00:56:46]

nit:  given that we're already qualifiying the names with CFWL_Event, you might
go back to regular eums here, and avoid typing a bunch of |::Type|.

[dsinclair, 2016/12/08 00:59:54]

I prefer to keep this an enum class so that we can't accidentally case to an int
or back. We know these are the only values.

+    CheckStateChanged,
+    CheckWord,
+    Click,
+    Close,
+    EditChanged,
+    Mouse,
+    PostDropDown,
+    PreDropDown,
+    Scroll,
+    SelectChanged,
+    TextChanged,
+    TextFull,
+    Validate
+  };
+
+  explicit CFWL_Event(Type type);
+  CFWL_Event(Type type, CFWL_Widget* pSrcTarget);
+  CFWL_Event(Type type, CFWL_Widget* pSrcTarget, CFWL_Widget* pDstTarget);
   virtual ~CFWL_Event();
 
-  virtual CFWL_EventType GetClassID() const;
+  Type GetType() const { return m_type; }
 
   CFWL_Widget* m_pSrcTarget;
   CFWL_Widget* m_pDstTarget;
+
+ private:
+  Type m_type;
 };
 
 #endif  // XFA_FWL_CORE_CFWL_EVENT_H_