Move xfa/include/fwl/{core,basewidget} to xfa/fwl/{core,basewidget}.

xfa/fwl/basewidget/ifwl_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_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
-#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
+#ifndef XFA_FWL_BASEWIDGET_IFWL_EDIT_H_
+#define XFA_FWL_BASEWIDGET_IFWL_EDIT_H_
 
 #include <vector>
 
 #include "xfa/include/fwl/lightwidget/widget.h"
-
-class CFWL_WidgetImpProperties;
-class IFWL_Edit;
+#include "xfa/fwl/core/ifwl_dataprovider.h"
 
 #define FWL_CLASS_Edit L"FWL_EDIT"
 #define FWL_CLASSHASH_Edit 2893987822
 #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)
@@ skipping 26 matching lines @@
 #define FWL_STATE_EDT_Editing (1 << FWL_WGTSTATE_MAX)
 #define FWL_PART_EDT_Border 1
 #define FWL_PART_EDT_Edge 2
 #define FWL_PART_EDT_Background 3
 #define FWL_PART_EDT_CombTextLine 4
 #define FWL_PARTDATA_EDT_Background 0
 #define FWL_PARTDATA_EDT_StaticBackground 1
 #define FWL_PARTSTATE_EDT_Normal (0L << 0)
 #define FWL_PARTSTATE_EDT_ReadOnly (1L << 0)
 #define FWL_PARTSTATE_EDT_Disable (2L << 0)
-enum FWL_EDT_TEXTCHANGED {
-  FWL_EDT_TEXTCHANGED_Insert = 0,
-  FWL_EDT_TEXTCHANGED_Delete,
-  FWL_EDT_TEXTCHANGED_Replace,
-};
-
 #define FWL_EVT_EDT_TextChanged L"FWL_EVENT_EDT_TextChanged"
 #define FWL_EVTHASH_EDT_TextChanged 1064022132
 #define FWL_EVT_EDT_PreSelfAdaption L"FWL_EVENT_PreSelfAdaption"
 #define FWL_EVTHASH_EDT_PreSelfAdaption 1001979178
 #define FWL_EVT_EDT_Validate L"FWL_EVTHASH_EDT_Validate"
 #define FWL_EVTHASH_EDT_Validate 3373308608
 #define FWL_EVT_EDT_CheckWord L"FWL_EVTHASH_EDT_CheckWord"
 #define FWL_EVTHASH_EDT_CheckWord 2897181520
 #define FWL_EVT_EDT_GetSuggestWords L"FWL_EVTHASH_EDT_GetSuggestWords"
 #define FWL_EVTHASH_EDT_GetSuggestWords 315782791
 #define FWL_EVT_EDT_TextFull L"FWL_EVTHASH_EDT_TextFull"
 #define FWL_EVTHASH_EDT_TextFull 2158580174
+#define FWL_EDT_FIND_FLAGS_Prev (0L << 0)
+#define FWL_EDT_FIND_FLAGS_Next (1L << 0)
+#define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1)
+#define FWL_EDT_FIND_FLAGS_NoCase (1L << 2)
+
+typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND;
+
+enum FWL_EDT_TEXTCHANGED {
+  FWL_EDT_TEXTCHANGED_Insert = 0,
+  FWL_EDT_TEXTCHANGED_Delete,
+  FWL_EDT_TEXTCHANGED_Replace,
+};
 
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextChanged, FWL_EVTHASH_EDT_TextChanged)
 int32_t nChangeType;
 CFX_WideString wsInsert;
 CFX_WideString wsDelete;
 CFX_WideString wsPrevText;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtTextFull, FWL_EVTHASH_EDT_TextFull)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtPreSelfAdaption, FWL_EVTHASH_EDT_PreSelfAdaption)
 FX_BOOL bHSelfAdaption;
 FX_BOOL bVSelfAdaption;
 CFX_RectF rtAfterChange;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtValidate, FWL_EVTHASH_EDT_Validate)
 IFWL_Widget* pDstWidget;
 CFX_WideString wsInsert;
 FX_BOOL bValidate;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtCheckWord, FWL_EVTHASH_EDT_CheckWord)
 CFX_ByteString bsWord;
 FX_BOOL bCheckWord;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtEdtGetSuggestWords, FWL_EVTHASH_EDT_GetSuggestWords)
 FX_BOOL bSuggestWords;
 CFX_ByteString bsWord;
 std::vector<CFX_ByteString> bsArraySuggestWords;
 END_FWL_EVENT_DEF
+
+class CFWL_WidgetImpProperties;
+
 class IFWL_EditDP : public IFWL_DataProvider {};
-#define FWL_EDT_FIND_FLAGS_Prev (0L << 0)
-#define FWL_EDT_FIND_FLAGS_Next (1L << 0)
-#define FWL_EDT_FIND_FLAGS_WholeWord (1L << 1)
-#define FWL_EDT_FIND_FLAGS_NoCase (1L << 2)
-typedef struct FWL_HEDTFIND_ { void* pData; } * FWL_HEDTFIND;
 
 class IFWL_Edit : public IFWL_Widget {
  public:
   static IFWL_Edit* Create(const CFWL_WidgetImpProperties& properties,
                            IFWL_Widget* pOuter);
   static IFWL_Edit* CreateComboEdit(const CFWL_WidgetImpProperties& properties,
                                     IFWL_Widget* pOuter);
 
   FWL_ERR SetText(const CFX_WideString& wsText);
   int32_t GetTextLength() const;
@@ skipping 37 matching lines @@
   void SetScrollOffset(FX_FLOAT fScrollOffset);
   FX_BOOL GetSuggestWords(CFX_PointF pointf,
                           std::vector<CFX_ByteString>& sSuggest);
   FX_BOOL ReplaceSpellCheckWord(CFX_PointF pointf,
                                 const CFX_ByteStringC& bsReplace);
 
  protected:
   IFWL_Edit();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_EDIT_H_