Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_monthcalendar.cpp

Index: xfa/fwl/cfwl_monthcalendar.cpp
diff --git a/xfa/fwl/core/cfwl_monthcalendar.cpp b/xfa/fwl/cfwl_monthcalendar.cpp
similarity index 98%
rename from xfa/fwl/core/cfwl_monthcalendar.cpp
rename to xfa/fwl/cfwl_monthcalendar.cpp
index 8a284aae52c6f14390f3b5a9e4b8629137536f7e..94d198599d3a2d6c87f143385ef87be1286c0309 100644
--- a/xfa/fwl/core/cfwl_monthcalendar.cpp
+++ b/xfa/fwl/cfwl_monthcalendar.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_monthcalendar.h"
+#include "xfa/fwl/cfwl_monthcalendar.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,13 +12,13 @@
 
 #include "third_party/base/ptr_util.h"
 #include "xfa/fde/tto/fde_textout.h"
-#include "xfa/fwl/core/cfwl_datetimepicker.h"
-#include "xfa/fwl/core/cfwl_formproxy.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_themetext.h"
-#include "xfa/fwl/core/ifwl_themeprovider.h"
+#include "xfa/fwl/cfwl_datetimepicker.h"
+#include "xfa/fwl/cfwl_formproxy.h"
+#include "xfa/fwl/cfwl_messagemouse.h"
+#include "xfa/fwl/cfwl_notedriver.h"
+#include "xfa/fwl/cfwl_themebackground.h"
+#include "xfa/fwl/cfwl_themetext.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 #define MONTHCAL_HSEP_HEIGHT 1
 #define MONTHCAL_VSEP_WIDTH 1
@@ -900,7 +900,7 @@ void CFWL_MonthCalendar::OnProcessMessage(CFWL_Message* pMessage) {
     case CFWL_Message::Type::Key:
       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);
@@ -930,7 +930,7 @@ void CFWL_MonthCalendar::OnDrawWidget(CFX_Graphics* pGraphics,
   DrawWidget(pGraphics, pMatrix);
 }
 
-void CFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonDown(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = CFWL_PartState_Pressed;
     PrevMonth();
@@ -951,7 +951,7 @@ void CFWL_MonthCalendar::OnLButtonDown(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_pWidgetMgr->IsFormDisabled())
     return DisForm_OnLButtonUp(pMsg);
 
@@ -995,7 +995,7 @@ void CFWL_MonthCalendar::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   m_bFlag = 0;
 }
 
-void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (m_rtLBtn.Contains(pMsg->m_fx, pMsg->m_fy)) {
     m_iLBtnPartStates = 0;
     Repaint(&(m_rtLBtn));
@@ -1029,7 +1029,7 @@ void CFWL_MonthCalendar::DisForm_OnLButtonUp(CFWL_MsgMouse* pMsg) {
   }
 }
 
-void CFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_MCD_MultiSelect)
     return;
 
@@ -1063,7 +1063,7 @@ void CFWL_MonthCalendar::OnMouseMove(CFWL_MsgMouse* pMsg) {
     Repaint(&rtInvalidate);
 }
 
-void CFWL_MonthCalendar::OnMouseLeave(CFWL_MsgMouse* pMsg) {
+void CFWL_MonthCalendar::OnMouseLeave(CFWL_MessageMouse* pMsg) {
   if (m_iHovered <= 0)
     return;