Merge IFWL and CFWL classes.

xfa/fwl/core/cfwl_picturebox.h

Index: xfa/fwl/core/cfwl_picturebox.h
diff --git a/xfa/fwl/core/cfwl_picturebox.h b/xfa/fwl/core/cfwl_picturebox.h
index a7b3f1ff9ddd157e93b701db94b4ea48fbd84bfe..f4097336fae696d9caad8b5731c6d301e53b1c90 100644
--- a/xfa/fwl/core/cfwl_picturebox.h
+++ b/xfa/fwl/core/cfwl_picturebox.h
@@ -7,15 +7,47 @@
 #ifndef XFA_FWL_CORE_CFWL_PICTUREBOX_H_
 #define XFA_FWL_CORE_CFWL_PICTUREBOX_H_
 
+#include <memory>
+
 #include "xfa/fwl/core/cfwl_widget.h"
-#include "xfa/fwl/core/ifwl_picturebox.h"
+#include "xfa/fwl/core/cfwl_widgetproperties.h"
+
+#define FWL_STYLEEXT_PTB_Left 0L << 0
+#define FWL_STYLEEXT_PTB_Center 1L << 0
+#define FWL_STYLEEXT_PTB_Right 2L << 0
+#define FWL_STYLEEXT_PTB_Top 0L << 2
+#define FWL_STYLEEXT_PTB_Vcenter 1L << 2
+#define FWL_STYLEEXT_PTB_Bottom 2L << 2
+#define FWL_STYLEEXT_PTB_Normal 0L << 4
+#define FWL_STYLEEXT_PTB_AutoSize 1L << 4
+#define FWL_STYLEEXT_PTB_StretchImage 2L << 4
+#define FWL_STYLEEXT_PTB_StretchHImage 3L << 4
+#define FWL_STYLEEXT_PTB_StretchVImage 4L << 4
+#define FWL_STYLEEXT_PTB_HAlignMask 3L << 0
+#define FWL_STYLEEXT_PTB_VAlignMask 3L << 2
+#define FWL_STYLEEXT_PTB_StretchAlignMask 7L << 4
+
+class CFX_DIBitmap;
+class CFWL_Widget;
 
 class CFWL_PictureBox : public CFWL_Widget {
  public:
   explicit CFWL_PictureBox(const CFWL_App* pApp);
   ~CFWL_PictureBox() override;
 
-  void Initialize();
+  // CFWL_Widget
+  FWL_Type GetClassID() const override;
+  void GetWidgetRect(CFX_RectF& rect, bool bAutoSize = false) override;
+  void Update() override;
+  void DrawWidget(CFX_Graphics* pGraphics,
+                  const CFX_Matrix* pMatrix = nullptr) override;
+  void OnDrawWidget(CFX_Graphics* pGraphics,
+                    const CFX_Matrix* pMatrix) override;
+
+ private:
+  CFX_RectF m_rtClient;
+  CFX_RectF m_rtImage;
+  CFX_Matrix m_matrix;
 };
 
 #endif  // XFA_FWL_CORE_CFWL_PICTUREBOX_H_