include/vcl/weld.hxx | 2 +- vcl/inc/salvtables.hxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit e3fa56977c585e5f354319ac70b15d42e9a84f74 Author: Caolán McNamara <[email protected]> AuthorDate: Sat May 15 19:54:38 2021 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat May 15 22:33:25 2021 +0200 inherit ComboBox from Widget instead of Container Change-Id: I7f6b6e90e08c710672335ddffaa41e385d33611f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115664 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index 1101df6b46c4..e55ca8d6b534 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -675,7 +675,7 @@ enum class EntryMessageType class Menu; /// A widget used to choose from a list of items. -class VCL_DLLPUBLIC ComboBox : virtual public Container +class VCL_DLLPUBLIC ComboBox : virtual public Widget { private: OUString m_sSavedValue; diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index a20a862d9a45..361d26e3d9fe 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -663,7 +663,7 @@ public: //ComboBox and ListBox have similar apis, ComboBoxes in LibreOffice have an edit box and ListBoxes //don't. This distinction isn't there in Gtk. Use a template to sort this problem out. template <class vcl_type> -class SalInstanceComboBox : public SalInstanceContainer, public virtual weld::ComboBox +class SalInstanceComboBox : public SalInstanceWidget, public virtual weld::ComboBox { protected: // owner for ListBox/ComboBox UserData @@ -674,7 +674,7 @@ protected: public: SalInstanceComboBox(vcl_type* pComboBox, SalInstanceBuilder* pBuilder, bool bTakeOwnership) - : SalInstanceContainer(pComboBox, pBuilder, bTakeOwnership) + : SalInstanceWidget(pComboBox, pBuilder, bTakeOwnership) , m_xComboBox(pComboBox) { } @@ -863,7 +863,7 @@ public: signal_popup_toggled(); return; } - SalInstanceContainer::HandleEventListener(rEvent); + SalInstanceWidget::HandleEventListener(rEvent); } }; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
