Merge delegates into IFWL_* classes.

xfa/fwl/core/ifwl_picturebox.h

Index: xfa/fwl/core/ifwl_picturebox.h
diff --git a/xfa/fwl/core/ifwl_picturebox.h b/xfa/fwl/core/ifwl_picturebox.h
index ecbbc449cb75e81e20aa24e627a24b7fb2621d48..05f094b25c687c75a017b6a75a66563db1a7dd5b 100644
--- a/xfa/fwl/core/ifwl_picturebox.h
+++ b/xfa/fwl/core/ifwl_picturebox.h
@@ -27,7 +27,6 @@
 #define FWL_STYLEEXT_PTB_VAlignMask 3L << 2
 #define FWL_STYLEEXT_PTB_StretchAlignMask 7L << 4
 
-class CFWL_PictureBoxImpDelegate;
 class CFWL_WidgetImpProperties;
 class CFX_DIBitmap;
 class IFWL_Widget;
@@ -54,10 +53,10 @@ class IFWL_PictureBox : public IFWL_Widget {
   FWL_Error Update() override;
   FWL_Error DrawWidget(CFX_Graphics* pGraphics,
                        const CFX_Matrix* pMatrix = nullptr) override;
+  void OnDrawWidget(CFX_Graphics* pGraphics,
+                    const CFX_Matrix* pMatrix) override;
 
  protected:
-  friend class CFWL_PictureBoxImpDelegate;
-
   void DrawBkground(CFX_Graphics* pGraphics,
                     IFWL_ThemeProvider* pTheme,
                     const CFX_Matrix* pMatrix = nullptr);
@@ -71,14 +70,4 @@ class IFWL_PictureBox : public IFWL_Widget {
   FX_BOOL m_bButton;
 };
 
-class CFWL_PictureBoxImpDelegate : public CFWL_WidgetImpDelegate {
- public:
-  CFWL_PictureBoxImpDelegate(IFWL_PictureBox* pOwner);
-  void OnDrawWidget(CFX_Graphics* pGraphics,
-                    const CFX_Matrix* pMatrix = nullptr) override;
-
- protected:
-  IFWL_PictureBox* m_pOwner;
-};
-
 #endif  // XFA_FWL_CORE_IFWL_PICTUREBOX_H_