Merge delegates into IFWL_* classes.

xfa/fwl/core/ifwl_checkbox.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_CHECKBOX_H_
 #define XFA_FWL_CORE_IFWL_CHECKBOX_H_
 
 #include "xfa/fwl/core/cfwl_event.h"
@@ skipping 25 matching lines @@
 #define FWL_STYLEEXT_CKB_VLayoutMask (3L << 2)
 #define FWL_STYLEEXT_CKB_ShapeMask (3L << 8)
 #define FWL_STYLEEXT_CKB_SignShapeMask (7L << 10)
 #define FWL_STATE_CKB_Hovered (1 << FWL_WGTSTATE_MAX)
 #define FWL_STATE_CKB_Pressed (1 << (FWL_WGTSTATE_MAX + 1))
 #define FWL_STATE_CKB_Unchecked (0 << (FWL_WGTSTATE_MAX + 2))
 #define FWL_STATE_CKB_Checked (1 << (FWL_WGTSTATE_MAX + 2))
 #define FWL_STATE_CKB_Neutral (2 << (FWL_WGTSTATE_MAX + 2))
 #define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2))
 
-class CFWL_CheckBoxImpDelegate;
 class CFWL_MsgMouse;
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 
 FWL_EVENT_DEF(CFWL_EvtCkbCheckStateChanged, CFWL_EventType::CheckStateChanged)
 
 class IFWL_CheckBoxDP : public IFWL_DataProvider {
  public:
   virtual FX_FLOAT GetBoxSize(IFWL_Widget* pWidget) = 0;
 };
 
 class IFWL_CheckBox : public IFWL_Widget {
  public:
   explicit IFWL_CheckBox(const IFWL_App* app,
                          const CFWL_WidgetImpProperties& properties);
   ~IFWL_CheckBox() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
   FWL_Error Update() override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
+
+  void OnProcessMessage(CFWL_Message* pMessage) override;
+  void OnDrawWidget(CFX_Graphics* pGraphics,
+                    const CFX_Matrix* pMatrix) override;
+
   int32_t GetCheckState();
   FWL_Error SetCheckState(int32_t iCheck);
 
  protected:
-  friend class CFWL_CheckBoxImpDelegate;
-
   void Layout();
   uint32_t GetPartStates();
   void UpdateTextOutStyles();
   void NextStates();
 
   CFX_RectF m_rtClient;
   CFX_RectF m_rtBox;
   CFX_RectF m_rtCaption;
   CFX_RectF m_rtFocus;
   uint32_t m_dwTTOStyles;
   int32_t m_iTTOAlign;
   FX_BOOL m_bBtnDown;
-};
 
-class CFWL_CheckBoxImpDelegate : public CFWL_WidgetImpDelegate {
- public:
-  CFWL_CheckBoxImpDelegate(IFWL_CheckBox* pOwner);
-
-  void OnProcessMessage(CFWL_Message* pMessage) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
-                    const CFX_Matrix* pMatrix = nullptr) override;
-
- protected:
+ private:
   void OnActivate(CFWL_Message* pMsg);
-  void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet = TRUE);
+  void OnFocusChanged(CFWL_Message* pMsg, FX_BOOL bSet);
   void OnLButtonDown(CFWL_MsgMouse* pMsg);
   void OnLButtonUp(CFWL_MsgMouse* pMsg);
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void OnKeyDown(CFWL_MsgKey* pMsg);
-
-  IFWL_CheckBox* m_pOwner;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_CHECKBOX_H_