Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_datetimepicker.cpp

Index: xfa/fwl/cfwl_datetimepicker.cpp
diff --git a/xfa/fwl/core/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
similarity index 95%
rename from xfa/fwl/core/cfwl_datetimepicker.cpp
rename to xfa/fwl/cfwl_datetimepicker.cpp
index 63f8955a0ec34ec40a1109706891ba3e437b8929..8bc17f3c57f3aa102836fa9aeecf4aafad5719a9 100644
--- a/xfa/fwl/core/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -4,22 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
 
 #include <memory>
 #include <utility>
 
 #include "third_party/base/ptr_util.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_evtselectchanged.h"
-#include "xfa/fwl/core/cfwl_formproxy.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_spinbutton.h"
-#include "xfa/fwl/core/cfwl_themebackground.h"
-#include "xfa/fwl/core/cfwl_widgetmgr.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_eventselectchanged.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_messagesetfocus.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_spinbutton.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
@@ -329,7 +329,7 @@ void CFWL_DateTimePicker::ProcessSelChanged(int32_t iYear,
   m_pEdit->Update();
   Repaint(&m_rtClient);
 
-  CFWL_EvtSelectChanged ev(this);
+  CFWL_EventSelectChanged ev(this);
   ev.iYear = m_iYear;
   ev.iMonth = m_iMonth;
   ev.iDay = m_iDay;
@@ -382,7 +382,7 @@ void CFWL_DateTimePicker::DisForm_ShowMonthCalendar(bool bActivate) {
     m_pMonthCal->SetStates(FWL_WGTSTATE_Invisible);
 
   if (bActivate) {
-    CFWL_MsgSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
+    CFWL_MessageSetFocus msg(m_pEdit.get(), m_pMonthCal.get());
     m_pEdit->GetDelegate()->OnProcessMessage(&msg);
   }
 
@@ -497,7 +497,7 @@ void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(pMessage, false);
       break;
     case CFWL_Message::Type::Mouse: {
-      CFWL_MsgMouse* pMouse = static_cast<CFWL_MsgMouse*>(pMessage);
+      CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
       switch (pMouse->m_dwCmd) {
         case FWL_MouseCommand::LeftButtonDown:
           OnLButtonDown(pMouse);
@@ -554,7 +554,7 @@ void CFWL_DateTimePicker::OnFocusChanged(CFWL_Message* pMsg, bool bSet) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_DateTimePicker::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Focused) == 0)
@@ -573,7 +573,7 @@ void CFWL_DateTimePicker::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtClient);
 }
 
-void CFWL_DateTimePicker::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
 
@@ -585,13 +585,13 @@ void CFWL_DateTimePicker::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   Repaint(&m_rtBtn);
 }
 
-void CFWL_DateTimePicker::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (!m_rtBtn.Contains(pMsg->m_fx, pMsg->m_fy))
     m_iBtnState = CFWL_PartState_Normal;
   Repaint(&m_rtBtn);
 }
 
-void CFWL_DateTimePicker::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_DateTimePicker::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (!pMsg)
     return;
   m_iBtnState = CFWL_PartState_Normal;