Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combolist.cpp

Index: xfa/fwl/cfwl_combolist.cpp
diff --git a/xfa/fwl/core/cfwl_combolist.cpp b/xfa/fwl/cfwl_combolist.cpp
similarity index 88%
rename from xfa/fwl/core/cfwl_combolist.cpp
rename to xfa/fwl/cfwl_combolist.cpp
index ff7bd2722c16c4175bd3321d1341fc6aa1ee3fae..4ec3abe072cb9cf66b97febc0d24bc9833ffc35c 100644
--- a/xfa/fwl/core/cfwl_combolist.cpp
+++ b/xfa/fwl/cfwl_combolist.cpp
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_combolist.h"
+#include "xfa/fwl/cfwl_combolist.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_combobox.h"
-#include "xfa/fwl/core/cfwl_comboedit.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgkillfocus.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagekillfocus.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
 
 CFWL_ComboList::CFWL_ComboList(
     const CFWL_App* app,
@@ -83,7 +83,7 @@ void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
       type == CFWL_Message::Type::KillFocus) {
     OnDropListFocusChanged(pMessage, type == CFWL_Message::Type::SetFocus);
   } else if (type == CFWL_Message::Type::Mouse) {
-    CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+    CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
     CFWL_ScrollBar* vertSB = GetVertScrollBar();
     if (IsShowScrollBar(true) && vertSB) {
       CFX_RectF rect = vertSB->GetWidgetRect();
@@ -114,7 +114,7 @@ void CFWL_ComboList::OnProcessMessage(CFWL_Message* pMessage) {
         break;
     }
   } else if (type == CFWL_Message::Type::Key) {
-    backDefault = !OnDropListKey(static_cast<CFWL_MsgKey*>(pMessage));
+    backDefault = !OnDropListKey(static_cast<CFWL_MessageKey*>(pMessage));
   }
   if (backDefault)
     CFWL_ListBox::OnProcessMessage(pMessage);
@@ -124,7 +124,7 @@ void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet)
     return;
 
-  CFWL_MsgKillFocus* pKill = static_cast<CFWL_MsgKillFocus*>(pMsg);
+  CFWL_MessageKillFocus* pKill = static_cast<CFWL_MessageKillFocus*>(pMsg);
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (pKill->m_pSetFocus == m_pOuter ||
       pKill->m_pSetFocus == pOuter->GetComboEdit()) {
@@ -132,7 +132,7 @@ void CFWL_ComboList::OnDropListFocusChanged(CFWL_Message* pMsg, bool bSet) {
   }
 }
 
-void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListMouseMove(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy)) {
     if (m_bNotifyOwner)
       m_bNotifyOwner = false;
@@ -156,7 +156,7 @@ void CFWL_ComboList::OnDropListMouseMove(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonDown(CFWL_MessageMouse* pMsg) {
   if (GetRTClient().Contains(pMsg->m_fx, pMsg->m_fy))
     return;
 
@@ -164,7 +164,7 @@ void CFWL_ComboList::OnDropListLButtonDown(CFWL_MsgMouse* pMsg) {
   pOuter->ShowDropList(false);
 }
 
-void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboList::OnDropListLButtonUp(CFWL_MessageMouse* pMsg) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   if (m_bNotifyOwner) {
     ClientToOuter(pMsg->m_fx, pMsg->m_fy);
@@ -185,7 +185,7 @@ void CFWL_ComboList::OnDropListLButtonUp(CFWL_MsgMouse* pMsg) {
     pOuter->ProcessSelChanged(true);
 }
 
-bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
+bool CFWL_ComboList::OnDropListKey(CFWL_MessageKey* pKey) {
   CFWL_ComboBox* pOuter = static_cast<CFWL_ComboBox*>(m_pOuter);
   bool bPropagate = false;
   if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown) {
@@ -218,7 +218,7 @@ bool CFWL_ComboList::OnDropListKey(CFWL_MsgKey* pKey) {
   return false;
 }
 
-void CFWL_ComboList::OnDropListKeyDown(CFWL_MsgKey* pKey) {
+void CFWL_ComboList::OnDropListKeyDown(CFWL_MessageKey* pKey) {
   uint32_t dwKeyCode = pKey->m_dwKeyCode;
   switch (dwKeyCode) {
     case FWL_VKEY_Up: