Merge delegates into IFWL_* classes.

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>
@@ skipping 58 matching lines @@
 };
 
 class CFWL_MsgMouse;
 class CFWL_MsgClose;
 class CFWL_MsgWindowMove;
 class CFWL_NoteLoop;
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
 class IFWL_ThemeProvider;
 class CFWL_SysBtn;
-class CFWL_FormImpDelegate;
 
 class IFWL_FormDP : public IFWL_DataProvider {
  public:
   virtual CFX_DIBitmap* GetIcon(IFWL_Widget* pWidget, FX_BOOL bBig) = 0;
 };
 
 class IFWL_Form : public IFWL_Widget {
  public:
   IFWL_Form(const IFWL_App* app,
             const CFWL_WidgetImpProperties& properties,
             IFWL_Widget* pOuter);
   ~IFWL_Form() override;
 
   // IFWL_Widget
   FWL_Type GetClassID() const override;
   FX_BOOL IsInstance(const CFX_WideStringC& wsClass) const override;
   FWL_Error GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize = FALSE) override;
   FWL_Error GetClientRect(CFX_RectF& rect) override;
   FWL_Error Update() override;
   FWL_WidgetHit HitTest(FX_FLOAT fx, FX_FLOAT fy) 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;
 
   FWL_FORMSIZE GetFormSize();
   FWL_Error SetFormSize(FWL_FORMSIZE eFormSize);
   IFWL_Widget* DoModal();
   IFWL_Widget* DoModal(uint32_t& dwCommandID);
   FWL_Error EndDoModal();
   FWL_Error SetBorderRegion(CFX_Path* pPath);
   void DrawBackground(CFX_Graphics* pGraphics, IFWL_ThemeProvider* pTheme);
   IFWL_Widget* GetSubFocus();
   void SetSubFocus(IFWL_Widget* pWidget);
@@ skipping 63 matching lines @@
   bool m_bMaximized;
   FX_BOOL m_bSetMaximize;
   bool m_bCustomizeLayout;
   FWL_FORMSIZE m_eFormSize;
   FX_BOOL m_bDoModalFlag;
   FX_FLOAT m_fSmallIconSz;
   FX_FLOAT m_fBigIconSz;
   CFX_DIBitmap* m_pBigIcon;
   CFX_DIBitmap* m_pSmallIcon;
   FX_BOOL m_bMouseIn;
-};
 
-class CFWL_FormImpDelegate : public CFWL_WidgetImpDelegate {
- public:
-  CFWL_FormImpDelegate(IFWL_Form* pOwner);
-  void OnProcessMessage(CFWL_Message* pMessage) override;
-  void OnProcessEvent(CFWL_Event* pEvent) override;
-  void OnDrawWidget(CFX_Graphics* pGraphics,
-                    const CFX_Matrix* pMatrix = nullptr) override;
-
- protected:
+ private:
   void OnLButtonDown(CFWL_MsgMouse* pMsg);
   void OnLButtonUp(CFWL_MsgMouse* pMsg);
   void OnMouseMove(CFWL_MsgMouse* pMsg);
   void OnMouseHover(CFWL_MsgMouse* pMsg);
   void OnMouseLeave(CFWL_MsgMouse* pMsg);
   void OnLButtonDblClk(CFWL_MsgMouse* pMsg);
   void OnWindowMove(CFWL_MsgWindowMove* pMsg);
   void OnClose(CFWL_MsgClose* pMsg);
-  IFWL_Form* m_pOwner;
 };
 
 #endif  // XFA_FWL_CORE_IFWL_FORM_H_