| Index: xfa/fwl/core/ifwl_pushbutton.cpp
|
| diff --git a/xfa/fwl/core/ifwl_pushbutton.cpp b/xfa/fwl/core/ifwl_pushbutton.cpp
|
| index 6040ae1117900743c8dac9af19d2c24b23342dbe..b9d11d9e5aa37e2ffd4ae729c7524ecc0d9c4972 100644
|
| --- a/xfa/fwl/core/ifwl_pushbutton.cpp
|
| +++ b/xfa/fwl/core/ifwl_pushbutton.cpp
|
| @@ -14,8 +14,9 @@
|
| #include "xfa/fwl/core/ifwl_pushbutton.h"
|
| #include "xfa/fwl/core/ifwl_themeprovider.h"
|
|
|
| -IFWL_PushButton::IFWL_PushButton(const CFWL_WidgetImpProperties& properties)
|
| - : IFWL_Widget(properties, nullptr),
|
| +IFWL_PushButton::IFWL_PushButton(const IFWL_App* app,
|
| + const CFWL_WidgetImpProperties& properties)
|
| + : IFWL_Widget(app, properties, nullptr),
|
| m_bBtnDown(FALSE),
|
| m_dwTTOStyles(FDE_TTOSTYLE_SingleLine),
|
| m_iTTOAlign(FDE_TTOALIGNMENT_Center) {
|
| @@ -25,16 +26,9 @@ IFWL_PushButton::IFWL_PushButton(const CFWL_WidgetImpProperties& properties)
|
|
|
| IFWL_PushButton::~IFWL_PushButton() {}
|
|
|
| -FWL_Type IFWL_PushButton::GetClassID() const {
|
| - return FWL_Type::PushButton;
|
| -}
|
| -
|
| -FWL_Error IFWL_PushButton::Initialize() {
|
| - if (IFWL_Widget::Initialize() != FWL_Error::Succeeded)
|
| - return FWL_Error::Indefinite;
|
| -
|
| +void IFWL_PushButton::Initialize() {
|
| + IFWL_Widget::Initialize();
|
| m_pDelegate = new CFWL_PushButtonImpDelegate(this);
|
| - return FWL_Error::Succeeded;
|
| }
|
|
|
| void IFWL_PushButton::Finalize() {
|
| @@ -43,6 +37,10 @@ void IFWL_PushButton::Finalize() {
|
| IFWL_Widget::Finalize();
|
| }
|
|
|
| +FWL_Type IFWL_PushButton::GetClassID() const {
|
| + return FWL_Type::PushButton;
|
| +}
|
| +
|
| FWL_Error IFWL_PushButton::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
|
| if (bAutoSize) {
|
| rect.Set(0, 0, 0, 0);
|
|
|