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

xfa/fwl/basewidget/ifwl_combobox.h

Index: xfa/fwl/basewidget/ifwl_combobox.h
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/fwl/basewidget/ifwl_combobox.h
similarity index 95%
rename from xfa/include/fwl/basewidget/fwl_combobox.h
rename to xfa/fwl/basewidget/ifwl_combobox.h
index 194d0b12e1b2c3e7dfb4ec5dfc738d128e2ed081..93efe287b2f143243b7d7c6a681b9e52ebef8816 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/fwl/basewidget/ifwl_combobox.h
@@ -4,10 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
-#define XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
+#ifndef XFA_FWL_BASEWIDGET_IFWL_COMBOBOX_H_
+#define XFA_FWL_BASEWIDGET_IFWL_COMBOBOX_H_
 
-#include "xfa/include/fwl/basewidget/fwl_listbox.h"
+#include "xfa/fwl/basewidget/ifwl_listbox.h"
+#include "xfa/fxgraphics/include/cfx_graphics.h"
 
 class CFWL_WidgetImpProperties;
 class IFWL_ComboBox;
@@ -49,11 +50,6 @@ class IFWL_ComboBox;
 #define FWL_PARTSTATE_CMB_Disabled (3L << 0)
 #define FWL_PARTSTATE_CMB_Selected (1L << 2)
 #define FWL_WGTCAPACITY_CMB_ComboFormHandler (FWL_WGTCAPACITY_MAX + 7)
-enum FWL_CMB_TEXTCHANGED {
-  FWL_CMB_TEXTCHANGED_Insert = 0,
-  FWL_CMB_TEXTCHANGED_Delete,
-  FWL_CMB_TEXTCHANGED_Replace,
-};
 #define FWL_EVT_CMB_DropDown L"FWL_EVENT_CMB_PreDropDown"
 #define FWL_EVT_CMB_PostDropDown L"FWL_EVENT_CMB_PostDropDown"
 #define FWL_EVT_CMB_CloseUp L"FWL_EVENT_CMB_CloseUp"
@@ -68,34 +64,49 @@ enum FWL_CMB_TEXTCHANGED {
 #define FWL_EVTHASH_CMB_SelChanged 2923227784
 #define FWL_EVTHASH_CMB_HoverChanged 944325448
 #define FWL_EVTHASH_CMB_DrawItem 917354551
+
+enum FWL_CMB_TEXTCHANGED {
+  FWL_CMB_TEXTCHANGED_Insert = 0,
+  FWL_CMB_TEXTCHANGED_Delete,
+  FWL_CMB_TEXTCHANGED_Replace,
+};
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbPreDropDown, FWL_EVTHASH_CMB_PreDropDown)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbPostDropDown, FWL_EVTHASH_CMB_PostDropDown)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbCloseUp, FWL_EVTHASH_CMB_CloseUp)
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbEditChanged, FWL_EVTHASH_CMB_EditChanged)
 int32_t nChangeType;
 CFX_WideString wsInsert;
 CFX_WideString wsDelete;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbSelChanged, FWL_EVTHASH_CMB_SelChanged)
 CFX_Int32Array iArraySels;
 FX_BOOL bLButtonUp;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbHoverChanged, FWL_EVTHASH_CMB_HoverChanged)
 int32_t m_iCurHover;
 END_FWL_EVENT_DEF
+
 BEGIN_FWL_EVENT_DEF(CFWL_EvtCmbDrawItem, FWL_EVTHASH_CMB_DrawItem)
 CFX_Graphics* m_pGraphics;
 CFX_Matrix m_matrix;
 int32_t m_index;
 CFX_RectF m_rtItem;
 END_FWL_EVENT_DEF
+
 class IFWL_ComboBoxDP : public IFWL_ListBoxDP {
  public:
   virtual FX_FLOAT GetListHeight(IFWL_Widget* pWidget) = 0;
 };
+
 class IFWL_ComboBox : public IFWL_Widget {
  public:
   static IFWL_ComboBox* Create(const CFWL_WidgetImpProperties& properties);
@@ -138,4 +149,4 @@ class IFWL_ComboBox : public IFWL_Widget {
   IFWL_ComboBox();
 };
 
-#endif  // XFA_INCLUDE_FWL_BASEWIDGET_FWL_COMBOBOX_H_
+#endif  // XFA_FWL_BASEWIDGET_IFWL_COMBOBOX_H_