Split fwl/core class pt I.

xfa/fwl/core/ifwl_form.cpp

Index: xfa/fwl/core/ifwl_form.cpp
diff --git a/xfa/fwl/core/ifwl_form.cpp b/xfa/fwl/core/ifwl_form.cpp
index a91e597cf7d07ef399ba93a2d912126a456d239b..10b68dee9f2768fb1e8ad6f1dc723cb5cd5c8519 100644
--- a/xfa/fwl/core/ifwl_form.cpp
+++ b/xfa/fwl/core/ifwl_form.cpp
@@ -10,6 +10,7 @@
 #include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fwl/core/cfwl_evtclose.h"
 #include "xfa/fwl/core/cfwl_msgmouse.h"
+#include "xfa/fwl/core/cfwl_sysbtn.h"
 #include "xfa/fwl/core/cfwl_themebackground.h"
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/cfwl_themetext.h"
@@ -475,7 +476,7 @@ void IFWL_Form::DrawCaptionText(CFX_Graphics* pGs,
                                 IFWL_ThemeProvider* pTheme,
                                 const CFX_Matrix* pMatrix) {
   CFX_WideString wsText;
-  IFWL_DataProvider* pData = m_pProperties->m_pDataProvider;
+  IFWL_Widget::DataProvider* pData = m_pProperties->m_pDataProvider;
   pData->GetCaption(this, wsText);
   if (wsText.IsEmpty())
     return;
@@ -679,7 +680,7 @@ void IFWL_Form::UpdateCaption() {
   if (!pWidgetMgr)
     return;
 
-  IFWL_DataProvider* pData = m_pProperties->m_pDataProvider;
+  IFWL_Widget::DataProvider* pData = m_pProperties->m_pDataProvider;
   if (!pData)
     return;
 
@@ -853,41 +854,3 @@ void IFWL_Form::OnLButtonDblClk(CFWL_MsgMouse* pMsg) {
     m_bMaximized = !m_bMaximized;
   }
 }
-
-CFWL_SysBtn::CFWL_SysBtn() {
-  m_rtBtn.Set(0, 0, 0, 0);
-  m_dwState = 0;
-}
-
-bool CFWL_SysBtn::IsDisabled() const {
-  return !!(m_dwState & FWL_SYSBUTTONSTATE_Disabled);
-}
-
-void CFWL_SysBtn::SetNormal() {
-  m_dwState &= 0xFFF0;
-}
-
-void CFWL_SysBtn::SetPressed() {
-  SetNormal();
-  m_dwState |= FWL_SYSBUTTONSTATE_Pressed;
-}
-
-void CFWL_SysBtn::SetHover() {
-  SetNormal();
-  m_dwState |= FWL_SYSBUTTONSTATE_Hover;
-}
-
-void CFWL_SysBtn::SetDisabled(bool bDisabled) {
-  bDisabled ? m_dwState |= FWL_SYSBUTTONSTATE_Disabled
-            : m_dwState &= ~FWL_SYSBUTTONSTATE_Disabled;
-}
-
-uint32_t CFWL_SysBtn::GetPartState() const {
-  if (IsDisabled())
-    return CFWL_PartState_Disabled;
-  if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
-    return CFWL_PartState_Pressed;
-  if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
-    return CFWL_PartState_Hovered;
-  return CFWL_PartState_Normal;
-}