Split fwl/core class pt I.

xfa/fwl/core/ifwl_form.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef XFA_FWL_CORE_IFWL_FORM_H_
 #define XFA_FWL_CORE_IFWL_FORM_H_
 
 #include <memory>
 
 #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"
 #define FWL_CLASS_FormProxy L"FWL_FORMPROXY"
 #define FWL_STYLEEXT_FRM_Resize (1L << 0)
 #define FWL_STYLEEXT_FRM_NativeBorder (1L << 1)
 #define FWL_STYLEEXT_FRM_RoundCorner (2L << 1)
 #define FWL_STYLEEXT_FRM_RoundCorner4 (3L << 1)
 #define FWL_STYLEEXT_FRM_NoDrawClient (1L << 3)
 #define FWL_STYLEEXT_FRM_BorderCornerMask (3L << 1)
 #define FWL_STYLEEXT_FRM_Max (3)
 
 #if (_FX_OS_ == _FX_MACOSX_)
 #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,
 };
 
 struct RestoreInfo {
   RestoreInfo();
   ~RestoreInfo();
 
   CFX_PointF m_ptStart;
   CFX_SizeF m_szStart;
 };
 
 class CFWL_MsgMouse;
 class CFWL_NoteLoop;
 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;
 };
 
 class IFWL_Form : public IFWL_Widget {
  public:
   IFWL_Form(const IFWL_App* app,
             std::unique_ptr<CFWL_WidgetProperties> properties,
             IFWL_Widget* pOuter);
   ~IFWL_Form() override;
@@ skipping 72 matching lines @@
   bool m_bSetMaximize;
   bool m_bCustomizeLayout;
   bool m_bDoModalFlag;
   FX_FLOAT m_fSmallIconSz;
   FX_FLOAT m_fBigIconSz;
   CFX_DIBitmap* m_pBigIcon;
   CFX_DIBitmap* m_pSmallIcon;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_FORM_H_