| Index: xfa/fwl/core/ifwl_combobox.cpp
|
| diff --git a/xfa/fwl/core/ifwl_combobox.cpp b/xfa/fwl/core/ifwl_combobox.cpp
|
| index 9d3e58cec6104c265911989ca88039231fbb6a87..edc430a0f24304242879491e301ede471b4993db 100644
|
| --- a/xfa/fwl/core/ifwl_combobox.cpp
|
| +++ b/xfa/fwl/core/ifwl_combobox.cpp
|
| @@ -35,11 +35,6 @@ IFWL_ComboBox::IFWL_ComboBox(const CFWL_WidgetImpProperties& properties)
|
|
|
| IFWL_ComboBox::~IFWL_ComboBox() {}
|
|
|
| -FWL_Error IFWL_ComboBox::GetClassName(CFX_WideString& wsClass) const {
|
| - wsClass = FWL_CLASS_ComboBox;
|
| - return FWL_Error::Succeeded;
|
| -}
|
| -
|
| FWL_Type IFWL_ComboBox::GetClassID() const {
|
| return FWL_Type::ComboBox;
|
| }
|
| @@ -74,14 +69,14 @@ FWL_Error IFWL_ComboBox::Initialize() {
|
| return FWL_Error::Succeeded;
|
| }
|
|
|
| -FWL_Error IFWL_ComboBox::Finalize() {
|
| - if (m_pEdit) {
|
| +void IFWL_ComboBox::Finalize() {
|
| + if (m_pEdit)
|
| m_pEdit->Finalize();
|
| - }
|
| +
|
| m_pListBox->Finalize();
|
| delete m_pDelegate;
|
| m_pDelegate = nullptr;
|
| - return IFWL_Widget::Finalize();
|
| + IFWL_Widget::Finalize();
|
| }
|
|
|
| FWL_Error IFWL_ComboBox::GetWidgetRect(CFX_RectF& rect, FX_BOOL bAutoSize) {
|
|
|