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

xfa/fwl/core/ifwl_widget.h

Index: xfa/fwl/core/ifwl_widget.h
diff --git a/xfa/include/fwl/core/fwl_widget.h b/xfa/fwl/core/ifwl_widget.h
similarity index 56%
rename from xfa/include/fwl/core/fwl_widget.h
rename to xfa/fwl/core/ifwl_widget.h
index 5588efe95e7823a1370e0e38e36f37ad99fa1f86..06e4bebc1c4b5740e8b656d6d9d1d472c745859c 100644
--- a/xfa/include/fwl/core/fwl_widget.h
+++ b/xfa/fwl/core/ifwl_widget.h
@@ -4,28 +4,22 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
-#define XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+#ifndef XFA_FWL_CORE_IFWL_WIDGET_H_
+#define XFA_FWL_CORE_IFWL_WIDGET_H_
 
-#include "xfa/include/fwl/core/fwl_note.h"
-#include "xfa/include/fwl/core/fwl_target.h"
-#include "xfa/include/fwl/core/fwl_widgetdef.h"
+#include "xfa/fwl/core/fwl_error.h"
+#include "core/fxcrt/include/fx_coordinates.h"
+#include "core/fxcrt/include/fx_system.h"
+#include "core/fxcrt/include/fx_basic.h"
+#include "xfa/fwl/core/ifwl_target.h"
 
-class IFWL_ThemeProvider;
-class CFWL_WidgetImpProperties;
+class CFX_Graphics;
 class IFWL_DataProvider;
-class IFWL_Widget;
-class IFWL_WidgetDelegate;
-class IFWL_Custom;
-class IFWL_Proxy;
 class IFWL_Form;
+class IFWL_NoteThread;
+class IFWL_ThemeProvider;
+class IFWL_WidgetDelegate;
 
-class IFWL_DataProvider {
- public:
-  virtual ~IFWL_DataProvider() {}
-  virtual FWL_ERR GetCaption(IFWL_Widget* pWidget,
-                             CFX_WideString& wsCaption) = 0;
-};
 class IFWL_Widget : public IFWL_Target {
  public:
   FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE);
@@ -63,58 +57,13 @@ class IFWL_Widget : public IFWL_Target {
   IFWL_NoteThread* GetOwnerThread() const;
   CFX_SizeF GetOffsetFromParent(IFWL_Widget* pParent);
 };
-class IFWL_WidgetDelegate {
- public:
-  virtual ~IFWL_WidgetDelegate() {}
-  virtual int32_t OnProcessMessage(CFWL_Message* pMessage) = 0;
-  virtual FWL_ERR OnProcessEvent(CFWL_Event* pEvent) = 0;
-  virtual FWL_ERR OnDrawWidget(CFX_Graphics* pGraphics,
-                               const CFX_Matrix* pMatrix = NULL) = 0;
-};
-class CFWL_WidgetImpProperties {
- public:
-  CFWL_WidgetImpProperties() {
-    m_ctmOnParent.SetIdentity();
-    m_rtWidget.Set(0, 0, 0, 0);
-    m_dwStyles = FWL_WGTSTYLE_Child;
-    m_dwStyleExes = 0;
-    m_dwStates = 0;
-    m_pThemeProvider = NULL;
-    m_pDataProvider = NULL;
-    m_pParent = NULL;
-    m_pOwner = NULL;
-  }
-  CFX_Matrix m_ctmOnParent;
-  CFX_RectF m_rtWidget;
-  FX_DWORD m_dwStyles;
-  FX_DWORD m_dwStyleExes;
-  FX_DWORD m_dwStates;
-  IFWL_ThemeProvider* m_pThemeProvider;
-  IFWL_DataProvider* m_pDataProvider;
-  IFWL_Widget* m_pParent;
-  IFWL_Widget* m_pOwner;
-};
-class IFWL_Custom : public IFWL_Widget {
- public:
-  static IFWL_Custom* Create(const CFWL_WidgetImpProperties& properties,
-                             IFWL_Widget* pOuter);
-
-  FWL_ERR SetProxy(IFWL_Proxy* pProxy);
 
- protected:
-  IFWL_Custom();
-};
-class IFWL_Proxy {
- public:
-  virtual ~IFWL_Proxy() {}
-  virtual FWL_ERR GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) = 0;
-  virtual FWL_ERR Update() = 0;
-};
 typedef CFX_MapPtrTemplate<FX_DWORD, FX_DWORD> CFX_MapAccelerators;
+
 FWL_ERR FWL_Accelerator_SetApp(CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_Accelerator_SetThread(CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_Accelerator_SetForm(IFWL_Form* pFrom,
                                 CFX_MapAccelerators* pMapAccel);
 FWL_ERR FWL_EnabelWidget(IFWL_Widget* widget, FX_BOOL bEnable);
 
-#endif  // XFA_INCLUDE_FWL_CORE_FWL_WIDGET_H_
+#endif  // XFA_FWL_CORE_IFWL_WIDGET_H_