Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_pushbutton.h

Index: xfa/fwl/cfwl_pushbutton.h
diff --git a/xfa/fwl/core/cfwl_pushbutton.h b/xfa/fwl/cfwl_pushbutton.h
similarity index 81%
rename from xfa/fwl/core/cfwl_pushbutton.h
rename to xfa/fwl/cfwl_pushbutton.h
index e5bd295a8cfce14bb40dd74fba390d75ab40e60e..4f6939a9534ba8c0f75b747e59980033366a8c97 100644
--- a/xfa/fwl/core/cfwl_pushbutton.h
+++ b/xfa/fwl/cfwl_pushbutton.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
-#define XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#ifndef XFA_FWL_CFWL_PUSHBUTTON_H_
+#define XFA_FWL_CFWL_PUSHBUTTON_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/cfwl_widgetproperties.h"
+#include "xfa/fwl/cfwl_widget.h"
+#include "xfa/fwl/cfwl_widgetproperties.h"
 
 #define FWL_STYLEEXT_PSB_Left (0L << 0)
 #define FWL_STYLEEXT_PSB_Center (1L << 0)
@@ -28,7 +28,7 @@
 #define FWL_STATE_PSB_Pressed (1 << (FWL_WGTSTATE_MAX + 1))
 #define FWL_STATE_PSB_Default (1 << (FWL_WGTSTATE_MAX + 2))
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFX_DIBitmap;
 class CFWL_Widget;
 
@@ -53,11 +53,11 @@ class CFWL_PushButton : public CFWL_Widget {
   uint32_t GetPartStates();
   void UpdateTextOutStyles();
   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_rtCaption;
@@ -66,4 +66,4 @@ class CFWL_PushButton : public CFWL_Widget {
   int32_t m_iTTOAlign;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_PUSHBUTTON_H_
+#endif  // XFA_FWL_CFWL_PUSHBUTTON_H_