Move xfa/fwl/core to xfa/fwl.

xfa/fwl/cfwl_edit.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FWL_CORE_CFWL_EDIT_H_
-#define XFA_FWL_CORE_CFWL_EDIT_H_
+#ifndef XFA_FWL_CFWL_EDIT_H_
+#define XFA_FWL_CFWL_EDIT_H_
 
 #include <deque>
 #include <memory>
 #include <vector>
 
 #include "xfa/fde/cfde_txtedtengine.h"
 #include "xfa/fde/ifde_txtedtdorecord.h"
-#include "xfa/fwl/core/cfwl_event.h"
-#include "xfa/fwl/core/cfwl_scrollbar.h"
-#include "xfa/fwl/core/cfwl_widget.h"
+#include "xfa/fwl/cfwl_event.h"
+#include "xfa/fwl/cfwl_scrollbar.h"
+#include "xfa/fwl/cfwl_widget.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
 #define FWL_STYLEEXT_EDT_ReadOnly (1L << 0)
 #define FWL_STYLEEXT_EDT_MultiLine (1L << 1)
 #define FWL_STYLEEXT_EDT_WantReturn (1L << 2)
 #define FWL_STYLEEXT_EDT_NoHideSel (1L << 3)
 #define FWL_STYLEEXT_EDT_AutoHScroll (1L << 4)
 #define FWL_STYLEEXT_EDT_AutoVScroll (1L << 5)
 #define FWL_STYLEEXT_EDT_NoRedoUndo (1L << 6)
 #define FWL_STYLEEXT_EDT_Validate (1L << 7)
@@ skipping 16 matching lines @@
 #define FWL_STYLEEXT_EDT_HAlignMask (3L << 18)
 #define FWL_STYLEEXT_EDT_VAlignMask (3L << 20)
 #define FWL_STYLEEXT_EDT_HAlignModeMask (3L << 22)
 #define FWL_STYLEEXT_EDT_InnerCaret (1L << 24)
 #define FWL_STYLEEXT_EDT_ShowScrollbarFocus (1L << 25)
 #define FWL_STYLEEXT_EDT_OuterScrollbar (1L << 26)
 #define FWL_STYLEEXT_EDT_LastLineHeight (1L << 27)
 
 class IFDE_TxtEdtDoRecord;
 class CFWL_Edit;
-class CFWL_MsgMouse;
+class CFWL_MessageMouse;
 class CFWL_WidgetProperties;
 class CFWL_Caret;
 
 class CFWL_Edit : public CFWL_Widget {
  public:
   CFWL_Edit(const CFWL_App* app,
             std::unique_ptr<CFWL_WidgetProperties> properties,
             CFWL_Widget* pOuter);
   ~CFWL_Edit() override;
 
@@ skipping 80 matching lines @@
   bool IsShowScrollBar(bool bVert);
   bool IsContentHeightOverflow();
   int32_t AddDoRecord(std::unique_ptr<IFDE_TxtEdtDoRecord> pRecord);
   void ProcessInsertError(int32_t iError);
   void AddSpellCheckObj(CFX_Path& PathData,
                         int32_t nStart,
                         int32_t nCount,
                         FX_FLOAT fOffSetX,
                         FX_FLOAT fOffSetY);
 
-  void DoButtonDown(CFWL_MsgMouse* pMsg);
+  void DoButtonDown(CFWL_MessageMouse* pMsg);
   void OnFocusChanged(CFWL_Message* pMsg, bool bSet);
-  void OnLButtonDown(CFWL_MsgMouse* pMsg);
-  void OnLButtonUp(CFWL_MsgMouse* pMsg);
-  void OnButtonDblClk(CFWL_MsgMouse* pMsg);
-  void OnMouseMove(CFWL_MsgMouse* pMsg);
-  void OnKeyDown(CFWL_MsgKey* pMsg);
-  void OnChar(CFWL_MsgKey* pMsg);
+  void OnLButtonDown(CFWL_MessageMouse* pMsg);
+  void OnLButtonUp(CFWL_MessageMouse* pMsg);
+  void OnButtonDblClk(CFWL_MessageMouse* pMsg);
+  void OnMouseMove(CFWL_MessageMouse* pMsg);
+  void OnKeyDown(CFWL_MessageKey* pMsg);
+  void OnChar(CFWL_MessageKey* pMsg);
   bool OnScroll(CFWL_ScrollBar* pScrollBar,
-                CFWL_EvtScroll::Code dwCode,
+                CFWL_EventScroll::Code dwCode,
                 FX_FLOAT fPos);
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtEngine;
   CFX_RectF m_rtStatic;
   FX_FLOAT m_fVAlignOffset;
   FX_FLOAT m_fScrollOffsetX;
   FX_FLOAT m_fScrollOffsetY;
   CFDE_TxtEdtEngine m_EdtEngine;
   bool m_bLButtonDown;
   int32_t m_nSelStart;
   int32_t m_nLimit;
   FX_FLOAT m_fFontSize;
   bool m_bSetRange;
   int32_t m_iMax;
   std::unique_ptr<CFWL_ScrollBar> m_pVertScrollBar;
   std::unique_ptr<CFWL_ScrollBar> m_pHorzScrollBar;
   std::unique_ptr<CFWL_Caret> m_pCaret;
   CFX_WideString m_wsCache;
   CFX_WideString m_wsFont;
   std::deque<std::unique_ptr<IFDE_TxtEdtDoRecord>> m_DoRecords;
   int32_t m_iCurRecord;
   int32_t m_iMaxRecord;
 };
 
-#endif  // XFA_FWL_CORE_CFWL_EDIT_H_
+#endif  // XFA_FWL_CFWL_EDIT_H_