Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_listbox.h

Index: xfa/fwl/cfwl_listbox.h
diff --git a/xfa/fwl/core/cfwl_listbox.h b/xfa/fwl/cfwl_listbox.h
similarity index 90%
rename from xfa/fwl/core/cfwl_listbox.h
rename to xfa/fwl/cfwl_listbox.h
index 905a040326b493a5cbc4e27dee29af5102377d7b..cdc3ef8933f0177947711250394fb9b84057d417 100644
--- a/xfa/fwl/core/cfwl_listbox.h
+++ b/xfa/fwl/cfwl_listbox.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_LISTBOX_H_
-#define XFA_FWL_CORE_CFWL_LISTBOX_H_
+#ifndef XFA_FWL_CFWL_LISTBOX_H_
+#define XFA_FWL_CFWL_LISTBOX_H_
 
 #include <memory>
 #include <vector>
 
-#include "xfa/fwl/core/cfwl_edit.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_listitem.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_edit.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_listitem.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_LTB_MultiSelection (1L << 0)
 #define FWL_STYLEEXT_LTB_ShowScrollBarAlaways (1L << 2)
@@ -33,9 +33,9 @@
 #define FWL_ITEMSTATE_LTB_Focused (1L << 1)
 #define FWL_ITEMSTATE_LTB_Checked (1L << 2)
 
-class CFWL_MsgKillFocus;
-class CFWL_MsgMouse;
-class CFWL_MsgMouseWheel;
+class CFWL_MessageKillFocus;
+class CFWL_MessageMouse;
+class CFWL_MessageMouseWheel;
 class CFX_DIBitmap;
 
 class CFWL_ListBox : public CFWL_Widget {
@@ -142,13 +142,13 @@ class CFWL_ListBox : public CFWL_Widget {
   FX_FLOAT GetScrollWidth();
 
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseWheel(CFWL_MsgMouseWheel* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseWheel(CFWL_MessageMouseWheel* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
   void OnVK(CFWL_ListItem* hItem, bool bShift, bool bCtrl);
   bool OnScroll(CFWL_ScrollBar* pScrollBar,
-                CFWL_EvtScroll::Code dwCode,
+                CFWL_EventScroll::Code dwCode,
                 FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
@@ -166,4 +166,4 @@ class CFWL_ListBox : public CFWL_Widget {
   std::vector<std::unique_ptr<CFWL_ListItem>> m_ItemArray;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_LISTBOX_H_
+#endif  // XFA_FWL_CFWL_LISTBOX_H_