Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_spinbutton.cpp

Index: xfa/fwl/cfwl_spinbutton.cpp
diff --git a/xfa/fwl/core/cfwl_spinbutton.cpp b/xfa/fwl/cfwl_spinbutton.cpp
similarity index 92%
rename from xfa/fwl/core/cfwl_spinbutton.cpp
rename to xfa/fwl/cfwl_spinbutton.cpp
index 68844f99000ad478e1fdf83948edc44afc5d684b..1c6662e70285b5c668ce8b1f501cd84c80c714ce 100644
--- a/xfa/fwl/core/cfwl_spinbutton.cpp
+++ b/xfa/fwl/cfwl_spinbutton.cpp
@@ -4,20 +4,20 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_spinbutton.h"
+#include "xfa/fwl/cfwl_spinbutton.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_msgkey.h"
-#include "xfa/fwl/core/cfwl_msgmouse.h"
-#include "xfa/fwl/core/cfwl_notedriver.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_timerinfo.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_messagekey.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_timerinfo.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 const int kElapseTime = 200;
@@ -157,7 +157,7 @@ void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
       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);
@@ -177,7 +177,7 @@ void CFWL_SpinButton::OnProcessMessage(CFWL_Message* pMessage) {
       break;
     }
     case CFWL_Message::Type::Key: {
-      CFWL_MsgKey* pKey = static_cast<CFWL_MsgKey*>(pMessage);
+      CFWL_MessageKey* pKey = static_cast<CFWL_MessageKey*>(pMessage);
       if (pKey->m_dwCmd == FWL_KeyCommand::KeyDown)
         OnKeyDown(pKey);
       break;
@@ -202,7 +202,7 @@ void CFWL_SpinButton::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   m_bLButtonDwn = true;
   SetGrab(true);
   SetFocus(true);
@@ -229,7 +229,7 @@ void CFWL_SpinButton::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   m_pTimerInfo = m_Timer.StartTimer(kElapseTime, true);
 }
 
-void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & CFWL_PartState_Disabled)
     return;
 
@@ -255,7 +255,7 @@ void CFWL_SpinButton::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_bLButtonDwn)
     return;
 
@@ -319,7 +319,7 @@ void CFWL_SpinButton::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvlidate);
 }
 
-void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_SpinButton::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   if (m_dwUpState != CFWL_PartState_Normal && IsUpButtonEnabled())
@@ -330,7 +330,7 @@ void CFWL_SpinButton::OnMouseLeave(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_SpinButton::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_SpinButton::OnKeyDown(CFWL_MessageKey* pMsg) {
   bool bUp =
       pMsg->m_dwKeyCode == FWL_VKEY_Up || pMsg->m_dwKeyCode == FWL_VKEY_Left;
   bool bDown =