include/vcl/weld.hxx | 1 +
vcl/source/app/salvtables.cxx | 2 ++
vcl/unx/gtk3/gtk3gtkinst.cxx | 5 +++++
3 files changed, 8 insertions(+)
New commits:
commit 365089ef53a1a1beed665618faa0ba6944df8c9c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Nov 10 20:35:17 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Nov 11 09:44:35 2020 +0100
support changing Expander's label
Change-Id: I9a7945f6bc1ed176dc4662571ebd876b61662e2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105568
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index d2a49e7ec1d1..ff949eb6dae8 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -2026,6 +2026,7 @@ protected:
void signal_expanded() { m_aExpandedHdl.Call(*this); }
public:
+ virtual void set_label(const OUString& rText) = 0;
virtual bool get_expanded() const = 0;
virtual void set_expanded(bool bExpand) = 0;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fd9b2777db41..938b2cdd95de 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5795,6 +5795,8 @@ public:
m_xExpander->SetExpandedHdl(LINK(this, SalInstanceExpander,
ExpandedHdl));
}
+ virtual void set_label(const OUString& rText) override {
m_xExpander->set_label(rText); }
+
virtual bool get_expanded() const override { return
m_xExpander->get_expanded(); }
virtual void set_expanded(bool bExpand) override {
m_xExpander->set_expanded(bExpand); }
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 83cf0aad9cec..5a96a97adf6b 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -16195,6 +16195,11 @@ public:
{
}
+ virtual void set_label(const OUString& rText) override
+ {
+ ::set_label(GTK_LABEL(gtk_expander_get_label_widget(m_pExpander)),
rText);
+ }
+
virtual bool get_expanded() const override
{
return gtk_expander_get_expanded(m_pExpander);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
