Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_form.h

Index: xfa/fwl/cfwl_form.h
diff --git a/xfa/fwl/core/cfwl_form.h b/xfa/fwl/cfwl_form.h
similarity index 86%
rename from xfa/fwl/core/cfwl_form.h
rename to xfa/fwl/cfwl_form.h
index 847256a57cafeda09bfae0ac922e53f2c7d50720..725e82b46e489a6720c9042530b1dfbf36ce2401 100644
--- a/xfa/fwl/core/cfwl_form.h
+++ b/xfa/fwl/cfwl_form.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_FORM_H_
-#define XFA_FWL_CORE_CFWL_FORM_H_
+#ifndef XFA_FWL_CFWL_FORM_H_
+#define XFA_FWL_CFWL_FORM_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
-#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_CLASS_Form L"FWL_FORM"
 #define FWL_CLASS_FormProxy L"FWL_FORMPROXY"
@@ -27,7 +27,7 @@
 #define FWL_UseMacSystemBorder
 #endif
 
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_NoteLoop;
 class CFWL_Widget;
 class IFWL_ThemeProvider;
@@ -70,11 +70,11 @@ class CFWL_Form : public CFWL_Widget {
   void ResetSysBtn();
   void RegisterForm();
   void UnRegisterForm();
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnMouseLeave(CFWL_MsgMouse* pMsg);
-  void OnLButtonDblClk(CFWL_MsgMouse* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnLButtonDblClk(CFWL_MessageMouse* pMsg);
 
 #if (_FX_OS_ == _FX_MACOSX_)
   bool m_bMouseIn;
@@ -96,4 +96,4 @@ class CFWL_Form : public CFWL_Widget {
   bool m_bDoModalFlag;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_FORM_H_
+#endif  // XFA_FWL_CFWL_FORM_H_