summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-15 19:54:38 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-05-15 22:33:25 +0200
commite3fa56977c585e5f354319ac70b15d42e9a84f74 (patch)
treee7563fc80ab341d186dcb76f88eca14c17bb3c91 /vcl
parent609416ca21aa2912908ef46d1129deec3cd24bae (diff)
inherit ComboBox from Widget instead of Container
Change-Id: I7f6b6e90e08c710672335ddffaa41e385d33611f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115664 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/inc/salvtables.hxx6
1 files changed, 3 insertions, 3 deletions
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);
}
};