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

xfa/fwl/basewidget/ifwl_listbox.h

Index: xfa/fwl/basewidget/ifwl_listbox.h
diff --git a/xfa/include/fwl/basewidget/fwl_listbox.h b/xfa/fwl/basewidget/ifwl_listbox.h
similarity index 94%
rename from xfa/include/fwl/basewidget/fwl_listbox.h
rename to xfa/fwl/basewidget/ifwl_listbox.h
index 4cf5c654d40891f8f9cfc5d2b5d8f8d3c19494b0..7bec4edd18cda26bb518865107cc444c852cc4bf 100644
--- a/xfa/include/fwl/basewidget/fwl_listbox.h
+++ b/xfa/fwl/basewidget/ifwl_listbox.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
-#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
+#ifndef XFA_FWL_BASEWIDGET_IFWL_LISTBOX_H_
+#define XFA_FWL_BASEWIDGET_IFWL_LISTBOX_H_
 
-#include "xfa/include/fwl/core/fwl_note.h"
-#include "xfa/include/fwl/core/fwl_widget.h"
-
-class IFWL_ListBoxDP;
+#include "xfa/fwl/core/ifwl_widget.h"
+#include "xfa/fwl/core/ifwl_dataprovider.h"
+#include "xfa/fwl/core/cfwl_event.h"
+#include "xfa/fwl/core/cfwl_widgetimpproperties.h"
 
 #define FWL_CLASS_ListBox L"FWL_LISTBOX"
 #define FWL_CLASSHASH_ListBox 1777358317
@@ -51,6 +51,16 @@ class IFWL_ListBoxDP;
 #define FWL_EVTHASH_LTB_SelChanged 1701781688
 #define FWL_EVTHASH_LTB_DrawItem 1050853991
 
+typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM;
+
+class CFX_DIBitmap;
+class IFWL_ListBoxDP;
+
+struct FWL_ListBoxItemData {
+  IFWL_ListBoxDP* pDataProvider;
+  int32_t iIndex;
+};
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtLtbSelChanged, FWL_EVTHASH_LTB_SelChanged)
 CFX_Int32Array iarraySels;
 END_FWL_EVENT_DEF
@@ -62,12 +72,6 @@ int32_t m_index;
 CFX_RectF m_rect;
 END_FWL_EVENT_DEF
 
-typedef struct FWL_HLISTITEM_ { void* pData; } * FWL_HLISTITEM;
-struct FWL_ListBoxItemData {
-  IFWL_ListBoxDP* pDataProvider;
-  int32_t iIndex;
-};
-
 class IFWL_ListBoxDP : public IFWL_DataProvider {
  public:
   virtual int32_t CountItems(IFWL_Widget* pWidget) = 0;
@@ -108,11 +112,13 @@ class IFWL_ListBoxDP : public IFWL_DataProvider {
                                     FWL_HLISTITEM hItem,
                                     FX_DWORD dwCheckState) = 0;
 };
+
 class IFWL_ListBoxCompare {
  public:
   virtual ~IFWL_ListBoxCompare() {}
   virtual int32_t Compare(FWL_HLISTITEM hLeft, FWL_HLISTITEM hRight) = 0;
 };
+
 class IFWL_ListBox : public IFWL_Widget {
  public:
   static IFWL_ListBox* Create(const CFWL_WidgetImpProperties& properties,
@@ -133,4 +139,4 @@ class IFWL_ListBox : public IFWL_Widget {
   IFWL_ListBox();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_LISTBOX_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_LISTBOX_H_