Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_spinbutton.h

Index: xfa/fwl/cfwl_spinbutton.h
diff --git a/xfa/fwl/core/cfwl_spinbutton.h b/xfa/fwl/cfwl_spinbutton.h
similarity index 81%
rename from xfa/fwl/core/cfwl_spinbutton.h
rename to xfa/fwl/cfwl_spinbutton.h
index dc480071ece3572892eb120422987a8b53d31289..4794461fb290660a7dd6c52da4259026b33fb403 100644
--- a/xfa/fwl/core/cfwl_spinbutton.h
+++ b/xfa/fwl/cfwl_spinbutton.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_SPINBUTTON_H_
-#define XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#ifndef XFA_FWL_CFWL_SPINBUTTON_H_
+#define XFA_FWL_CFWL_SPINBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_timer.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_timer.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxfa/cxfa_eventparam.h"
 
 #define FWL_STYLEEXE_SPB_Vert (1L << 0)
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 
 class CFWL_SpinButton : public CFWL_Widget {
@@ -53,11 +53,11 @@ class CFWL_SpinButton : public CFWL_Widget {
                       IFWL_ThemeProvider* pTheme,
                       const CFX_Matrix* pMatrix);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtUpButton;
@@ -70,4 +70,4 @@ class CFWL_SpinButton : public CFWL_Widget {
   CFWL_SpinButton::Timer m_Timer;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_SPINBUTTON_H_
+#endif  // XFA_FWL_CFWL_SPINBUTTON_H_