Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_combobox.h

Index: xfa/fwl/cfwl_combobox.h
diff --git a/xfa/fwl/core/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h
similarity index 89%
rename from xfa/fwl/core/cfwl_combobox.h
rename to xfa/fwl/cfwl_combobox.h
index 26c54b537713756a94c55f8fad1b955a6bb46ec3..9927b65c043b6783c280b36af9370e47bd32dfa3 100644
--- a/xfa/fwl/core/cfwl_combobox.h
+++ b/xfa/fwl/cfwl_combobox.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_COMBOBOX_H_
-#define XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#ifndef XFA_FWL_CFWL_COMBOBOX_H_
+#define XFA_FWL_CFWL_COMBOBOX_H_
 
 #include <memory>
 
-#include "xfa/fwl/core/cfwl_comboboxproxy.h"
-#include "xfa/fwl/core/cfwl_comboedit.h"
-#include "xfa/fwl/core/cfwl_combolist.h"
-#include "xfa/fwl/core/cfwl_form.h"
-#include "xfa/fwl/core/cfwl_listbox.h"
+#include "xfa/fwl/cfwl_comboboxproxy.h"
+#include "xfa/fwl/cfwl_comboedit.h"
+#include "xfa/fwl/cfwl_combolist.h"
+#include "xfa/fwl/cfwl_form.h"
+#include "xfa/fwl/cfwl_listbox.h"
 #include "xfa/fxgraphics/cfx_graphics.h"
 
 class CFWL_WidgetProperties;
@@ -127,12 +127,12 @@ class CFWL_ComboBox : public CFWL_Widget {
   void ResetListItemAlignment();
   void InitProxyForm();
   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 OnKey(CFWL_MsgKey* pMsg);
-  void DoSubCtrlKey(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnMouseLeave(CFWL_MessageMouse* pMsg);
+  void OnKey(CFWL_MessageKey* pMsg);
+  void DoSubCtrlKey(CFWL_MessageKey* pMsg);
 
   void DisForm_InitComboList();
   void DisForm_InitComboEdit();
@@ -148,9 +148,9 @@ class CFWL_ComboBox : public CFWL_Widget {
   CFX_RectF DisForm_GetBBox() const;
   void DisForm_Layout();
   void DisForm_OnProcessMessage(CFWL_Message* pMessage);
-  void DisForm_OnLButtonDown(CFWL_MsgMouse* pMsg);
+  void DisForm_OnLButtonDown(CFWL_MessageMouse* pMsg);
   void DisForm_OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void DisForm_OnKey(CFWL_MsgKey* pMsg);
+  void DisForm_OnKey(CFWL_MessageKey* pMsg);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtContent;
@@ -169,4 +169,4 @@ class CFWL_ComboBox : public CFWL_Widget {
   FX_FLOAT m_fItemHeight;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_COMBOBOX_H_
+#endif  // XFA_FWL_CFWL_COMBOBOX_H_