1 files changed, 11 insertions, 16 deletions
diff --git a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
index 7c02052f74..8650b5545a 100644
--- a/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_pictureboximp.cpp
@@ -9,25 +9,20 @@
 #include "../core/include/fwl_noteimp.h"
 #include "../core/include/fwl_widgetimp.h"
 #include "include/fwl_pictureboximp.h"
-IFWL_PictureBox::IFWL_PictureBox() {
-}
-FWL_ERR IFWL_PictureBox::Initialize(const CFWL_WidgetImpProperties& properties,
-                                    IFWL_Widget* pOuter) {
+
+// static
+IFWL_PictureBox* IFWL_PictureBox::Create(
+    const CFWL_WidgetImpProperties& properties,
+    IFWL_Widget* pOuter) {
+  IFWL_PictureBox* pPictureBox = new IFWL_PictureBox;
   CFWL_PictureBoxImp* pPictureBoxImpl =
       new CFWL_PictureBoxImp(properties, pOuter);
-  SetImpl(pPictureBoxImpl);
-  pPictureBoxImpl->SetInterface(this);
-  return pPictureBoxImpl->Initialize();
-}
-CFWL_PictureBoxImp::CFWL_PictureBoxImp(IFWL_Widget* pOuter)
-    : CFWL_WidgetImp(pOuter),
-      m_bTop(FALSE),
-      m_bVCenter(FALSE),
-      m_bButton(FALSE) {
-  m_rtClient.Reset();
-  m_rtImage.Reset();
-  m_matrix.SetIdentity();
+  pPictureBox->SetImpl(pPictureBoxImpl);
+  pPictureBoxImpl->SetInterface(pPictureBox);
+  return pPictureBox;
 }
+IFWL_PictureBox::IFWL_PictureBox() {}
+
 CFWL_PictureBoxImp::CFWL_PictureBoxImp(
     const CFWL_WidgetImpProperties& properties,
     IFWL_Widget* pOuter)