Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_checkbox.cpp

Index: xfa/fwl/cfwl_checkbox.cpp
diff --git a/xfa/fwl/core/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
similarity index 95%
rename from xfa/fwl/core/cfwl_checkbox.cpp
rename to xfa/fwl/cfwl_checkbox.cpp
index 8d99d7acf5f4840dcba90190999e639261abaa33..2e375489542e72191394f7539e7a25d1233b95ed 100644
--- a/xfa/fwl/core/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fwl/core/cfwl_checkbox.h"
+#include "xfa/fwl/cfwl_checkbox.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,15 +12,15 @@
 
 #include "third_party/base/ptr_util.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_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_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_messagekey.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/cfwl_widgetmgr.h"
+#include "xfa/fwl/ifwl_themeprovider.h"
 
 namespace {
 
@@ -331,7 +331,7 @@ void CFWL_CheckBox::OnProcessMessage(CFWL_Message* pMessage) {
       OnFocusChanged(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();
@@ -351,7 +351,7 @@ void CFWL_CheckBox::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;
@@ -389,7 +389,7 @@ void CFWL_CheckBox::OnLButtonDown() {
   Repaint(&m_rtClient);
 }
 
-void CFWL_CheckBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
+void CFWL_CheckBox::OnLButtonUp(CFWL_MessageMouse* pMsg) {
   if (!m_bBtnDown)
     return;
 
@@ -402,7 +402,7 @@ void CFWL_CheckBox::OnLButtonUp(CFWL_MsgMouse* pMsg) {
   NextStates();
 }
 
-void CFWL_CheckBox::OnMouseMove(CFWL_MsgMouse* pMsg) {
+void CFWL_CheckBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)
     return;
 
@@ -448,7 +448,7 @@ void CFWL_CheckBox::OnMouseLeave() {
   Repaint(&m_rtBox);
 }
 
-void CFWL_CheckBox::OnKeyDown(CFWL_MsgKey* pMsg) {
+void CFWL_CheckBox::OnKeyDown(CFWL_MessageKey* pMsg) {
   if (pMsg->m_dwKeyCode == FWL_VKEY_Tab)
     return;
   if (pMsg->m_dwKeyCode == FWL_VKEY_Return ||