Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combobox.cpp

Index: xfa/fwl/cfwl_combobox.cpp
diff --git a/xfa/fwl/core/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
similarity index 94%
rename from xfa/fwl/core/cfwl_combobox.cpp
rename to xfa/fwl/cfwl_combobox.cpp
index bfc3f32f4642c39062078406ac8ca2b98ee391f4..90366979f44546bf496c882879e939e5962b849a 100644
--- a/xfa/fwl/core/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_combobox.h"
+#include "xfa/fwl/cfwl_combobox.h"
 
 #include <algorithm>
 #include <memory>
@@ -13,22 +13,22 @@
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_app.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_evttextchanged.h"
-#include "xfa/fwl/core/cfwl_formproxy.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/core/cfwl_msgsetfocus.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_themepart.h"
-#include "xfa/fwl/core/cfwl_themetext.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_app.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_eventtextchanged.h"
+#include "xfa/fwl/cfwl_formproxy.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"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themepart.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 CFWL_ComboBox::CFWL_ComboBox(const CFWL_App* app)
     : CFWL_Widget(app, pdfium::MakeUnique<CFWL_WidgetProperties>(), nullptr),
@@ -527,7 +527,7 @@ void CFWL_ComboBox::ProcessSelChanged(bool bLButtonUp) {
     m_pEdit->SetSelected();
   }
 
-  CFWL_EvtSelectChanged ev(this);
+  CFWL_EventSelectChanged ev(this);
   ev.bLButtonUp = bLButtonUp;
   DispatchEvent(&ev);
 }
@@ -772,7 +772,7 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMsg);
@@ -792,7 +792,7 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key:
-      OnKey(static_cast<CFWL_MsgKey*>(pMessage));
+      OnKey(static_cast<CFWL_MessageKey*>(pMessage));
       break;
     default:
       break;
@@ -804,8 +804,8 @@ void CFWL_ComboBox::OnProcessMessage(CFWL_Message* pMessage) {
 void CFWL_ComboBox::OnProcessEvent(CFWL_Event* pEvent) {
   CFWL_Event::Type type = pEvent->GetType();
   if (type == CFWL_Event::Type::Scroll) {
-    CFWL_EvtScroll* pScrollEvent = static_cast<CFWL_EvtScroll*>(pEvent);
-    CFWL_EvtScroll pScrollEv(this);
+    CFWL_EventScroll* pScrollEvent = static_cast<CFWL_EventScroll*>(pEvent);
+    CFWL_EventScroll pScrollEv(this);
     pScrollEv.m_iScrollCode = pScrollEvent->m_iScrollCode;
     pScrollEv.m_fPos = pScrollEvent->m_fPos;
     DispatchEvent(&pScrollEv);
@@ -846,7 +846,7 @@ void CFWL_ComboBox::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   m_pEdit->ClearSelected();
 }
 
-void CFWL_ComboBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
@@ -866,7 +866,7 @@ void CFWL_ComboBox::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_ComboBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   m_bLButtonDown = false;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Hovered;
@@ -876,7 +876,7 @@ void CFWL_ComboBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtBtn);
 }
 
-void CFWL_ComboBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   int32_t iOldState = m_iBtnState;
   if (m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iBtnState =
@@ -891,7 +891,7 @@ void CFWL_ComboBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboBox::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!IsDropListVisible() &&
       !((m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled) ==
         FWL_WGTSTATE_Disabled)) {
@@ -900,7 +900,7 @@ void CFWL_ComboBox::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_ComboBox::OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   if (dwKeyCode == FWL_VKEY_Tab)
     return;
@@ -908,7 +908,7 @@ void CFWL_ComboBox::OnKey(CFWL_MsgKey* pMsg) {
     DoSubCtrlKey(pMsg);
 }
 
-void CFWL_ComboBox::DoSubCtrlKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DoSubCtrlKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;
@@ -969,7 +969,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     }
     case CFWL_Message::Type::Mouse: {
       backDefault = false;
-      CFWL_MsgMouse* pMsg = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMsg->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           DisForm_OnLButtonDown(pMsg);
@@ -984,7 +984,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     }
     case CFWL_Message::Type::Key: {
       backDefault = false;
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyUp)
         break;
       if (DisForm_IsDropListVisible() &&
@@ -1008,7 +1008,7 @@ void CFWL_ComboBox::DisForm_OnProcessMessage(CFWL_Message* pMessage) {
     CFWL_Widget::OnProcessMessage(pMessage);
 }
 
-void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_ComboBox::DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg) {
   bool bDropDown = DisForm_IsDropListVisible();
   CFX_RectF& rtBtn = bDropDown ? m_rtBtn : m_rtClient;
   if (!rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
@@ -1027,18 +1027,18 @@ void CFWL_ComboBox::DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   if (bSet) {
     m_pProperties->m_dwStates |= FWL_WGTSTATE_Focused;
     if ((m_pEdit->GetStates() & FWL_WGTSTATE_Focused) == 0) {
-      CFWL_MsgSetFocus msg(nullptr, m_pEdit.get());
+      CFWL_MessageSetFocus msg(nullptr, m_pEdit.get());
       m_pEdit->GetDelegate()->OnProcessMessage(&msg);
     }
   } else {
     m_pProperties->m_dwStates &= ~FWL_WGTSTATE_Focused;
     DisForm_ShowDropList(false);
-    CFWL_MsgKillFocus msg(m_pEdit.get());
+    CFWL_MessageKillFocus msg(m_pEdit.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 }
 
-void CFWL_ComboBox::DisForm_OnKey(CFWL_MsgKey* pMsg) {
+void CFWL_ComboBox::DisForm_OnKey(CFWL_MessageKey* pMsg) {
   uint32_t dwKeyCode = pMsg->m_dwKeyCode;
   const bool bUp = dwKeyCode == FWL_VKEY_Up;
   const bool bDown = dwKeyCode == FWL_VKEY_Down;