| Index: xfa/fwl/core/ifwl_picturebox.cpp
|
| diff --git a/xfa/fwl/core/ifwl_picturebox.cpp b/xfa/fwl/core/ifwl_picturebox.cpp
|
| index 9e0e0b86230be9df3f8914fad0a858d8e367a4df..20ab54a37cdf13b25b9e9f9554725d0010e38d21 100644
|
| --- a/xfa/fwl/core/ifwl_picturebox.cpp
|
| +++ b/xfa/fwl/core/ifwl_picturebox.cpp
|
| @@ -9,8 +9,9 @@
|
| #include "xfa/fwl/core/cfwl_picturebox.h"
|
| #include "xfa/fwl/core/fwl_noteimp.h"
|
|
|
| -IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
|
| - : IFWL_Widget(properties, nullptr),
|
| +IFWL_PictureBox::IFWL_PictureBox(const IFWL_App* app,
|
| + const CFWL_WidgetImpProperties& properties)
|
| + : IFWL_Widget(app, properties, nullptr),
|
| m_bTop(FALSE),
|
| m_bVCenter(FALSE),
|
| m_bButton(FALSE) {
|
| @@ -21,16 +22,9 @@ IFWL_PictureBox::IFWL_PictureBox(const CFWL_WidgetImpProperties& properties)
|
|
|
| IFWL_PictureBox::~IFWL_PictureBox() {}
|
|
|
| -FWL_Type IFWL_PictureBox::GetClassID() const {
|
| - return FWL_Type::PictureBox;
|
| -}
|
| -
|
| -FWL_Error IFWL_PictureBox::Initialize() {
|
| - if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
|
| - return FWL_Error::Indefinite;
|
| -
|
| +void IFWL_PictureBox::Initialize() {
|
| + IFWL_Widget::Initialize();
|
| m_pDelegate = new CFWL_PictureBoxImpDelegate(this);
|
| - return FWL_Error::Succeeded;
|
| }
|
|
|
| void IFWL_PictureBox::Finalize() {
|
| @@ -39,6 +33,10 @@ void IFWL_PictureBox::Finalize() {
|
| IFWL_Widget::Finalize();
|
| }
|
|
|
| +FWL_Type IFWL_PictureBox::GetClassID() const {
|
| + return FWL_Type::PictureBox;
|
| +}
|
| +
|
| FWL_Error IFWL_PictureBox::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
|
| if (bAutoSize) {
|
| rect.Set(0, 0, 0, 0);
|
|
|