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

xfa/fwl/basewidget/ifwl_edit.h

Index: xfa/fwl/basewidget/ifwl_edit.h
diff --git a/xfa/include/fwl/basewidget/fwl_edit.h b/xfa/fwl/basewidget/ifwl_edit.h
similarity index 97%
rename from xfa/include/fwl/basewidget/fwl_edit.h
rename to xfa/fwl/basewidget/ifwl_edit.h
index 79a7a842303d57ddb9dbc03128c9aaa15878f9a3..74b66e87793b1f857f61be077c9bb2d02086f994 100644
--- a/xfa/include/fwl/basewidget/fwl_edit.h
+++ b/xfa/fwl/basewidget/ifwl_edit.h
@@ -4,15 +4,13 @@
 
 // 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
@@ -59,12 +57,6 @@ class IFWL_Edit;
 #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"
@@ -77,6 +69,18 @@ enum FWL_EDT_TEXTCHANGED {
 #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;
@@ -84,33 +88,36 @@ 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:
@@ -168,4 +175,4 @@ class IFWL_Edit : public IFWL_Widget {
   IFWL_Edit();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_EDIT_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_EDIT_H_