Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_checkbox.h

Index: xfa/fwl/cfwl_checkbox.h
diff --git a/xfa/fwl/core/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h
similarity index 87%
rename from xfa/fwl/core/cfwl_checkbox.h
rename to xfa/fwl/cfwl_checkbox.h
index f699aa00594243c1a298db68bcec8483b1468ff7..d228eee05706fd255fa1028ebcdda321d5a9f6b2 100644
--- a/xfa/fwl/core/cfwl_checkbox.h
+++ b/xfa/fwl/cfwl_checkbox.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_CHECKBOX_H_
-#define XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#ifndef XFA_FWL_CFWL_CHECKBOX_H_
+#define XFA_FWL_CFWL_CHECKBOX_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_CKB_Left (0L << 0)
 #define FWL_STYLEEXT_CKB_Center (1L << 0)
@@ -44,7 +44,7 @@
 #define FWL_STATE_CKB_Neutral (2 << (FWL_WGTSTATE_MAX + 2))
 #define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2))
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 class CFWL_Widget;
 
@@ -72,10 +72,10 @@ class CFWL_CheckBox : public CFWL_Widget {
   void NextStates();
   void OnFocusChanged(bool bSet);
   void OnLButtonDown();
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
   void OnMouseLeave();
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtBox;
@@ -87,4 +87,4 @@ class CFWL_CheckBox : public CFWL_Widget {
   FX_FLOAT m_fBoxHeight;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_CHECKBOX_H_
+#endif  // XFA_FWL_CFWL_CHECKBOX_H_