Split fwl/core class pt I.

xfa/fwl/core/ifwl_form.h

Index: xfa/fwl/core/ifwl_form.h
diff --git a/xfa/fwl/core/ifwl_form.h b/xfa/fwl/core/ifwl_form.h
index d4244d535474f8be8162bb40ef4c81aaa59eb29b..9ddf395cccab9500fd6a4a6f2bf2da282e335709 100644
--- a/xfa/fwl/core/ifwl_form.h
+++ b/xfa/fwl/core/ifwl_form.h
@@ -11,7 +11,6 @@
 
 #include "core/fxcrt/fx_system.h"
 #include "xfa/fwl/core/cfwl_widgetproperties.h"
-#include "xfa/fwl/core/ifwl_dataprovider.h"
 #include "xfa/fwl/core/ifwl_widget.h"
 
 #define FWL_CLASS_Form L"FWL_FORM"
@@ -28,33 +27,6 @@
 #define FWL_UseMacSystemBorder
 #endif
 
-#define FWL_SYSBUTTONSTATE_Hover 0x0001
-#define FWL_SYSBUTTONSTATE_Pressed 0x0002
-#define FWL_SYSBUTTONSTATE_Disabled 0x0010
-
-enum FWL_FORMSIZE {
-  FWL_FORMSIZE_Manual = 0,
-  FWL_FORMSIZE_Width,
-  FWL_FORMSIZE_Height,
-  FWL_FORMSIZE_All,
-};
-
-class CFWL_SysBtn {
- public:
-  CFWL_SysBtn();
-
-  bool IsDisabled() const;
-  uint32_t GetPartState() const;
-
-  void SetNormal();
-  void SetPressed();
-  void SetHover();
-  void SetDisabled(bool bDisabled);
-
-  CFX_RectF m_rtBtn;
-  uint32_t m_dwState;
-};
-
 enum FORM_RESIZETYPE {
   FORM_RESIZETYPE_None = 0,
   FORM_RESIZETYPE_Cap,
@@ -74,7 +46,7 @@ class IFWL_Widget;
 class IFWL_ThemeProvider;
 class CFWL_SysBtn;
 
-class IFWL_FormDP : public IFWL_DataProvider {
+class IFWL_FormDP : public IFWL_Widget::DataProvider {

[npm, 2016/11/21 15:56:18]

Ditto... but I imagine you tried already since I saw some inside.

[dsinclair, 2016/11/21 16:00:42]

Followup.

FormDP will actually go away, I'm just working through the series of CLs to get
there.

  public:
   virtual CFX_DIBitmap* GetIcon(IFWL_Widget* pWidget, bool bBig) = 0;
 };