vcl/unx/gtk3/gtkinst.cxx | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 3fdf145e699c5b639c6da722ec4de2d0ed49cfec
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 21 14:07:10 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 21 18:25:56 2021 +0200
inherit CheckButton from Widget instead of Button
seeing as GtkCheckButton no longer supports Button-alike features
Change-Id: Ic7c882c68fa2d6d2b5bdd0dcca7d27e4b39daf46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115934
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 278e21f66a71..a00cb56f56b6 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -9834,7 +9834,7 @@ public:
}
};
-class GtkInstanceCheckButton : public GtkInstanceButton, public virtual
weld::CheckButton
+class GtkInstanceCheckButton : public GtkInstanceWidget, public virtual
weld::CheckButton
{
private:
GtkCheckButton* m_pCheckButton;
@@ -9849,7 +9849,7 @@ private:
public:
GtkInstanceCheckButton(GtkCheckButton* pButton, GtkInstanceBuilder*
pBuilder, bool bTakeOwnership)
- : GtkInstanceButton(GTK_BUTTON(pButton), pBuilder, bTakeOwnership)
+ : GtkInstanceWidget(GTK_WIDGET(pButton), pBuilder, bTakeOwnership)
, m_pCheckButton(pButton)
, m_nSignalId(g_signal_connect(m_pCheckButton, "toggled",
G_CALLBACK(signalToggled), this))
{
@@ -9923,12 +9923,12 @@ public:
virtual void disable_notify_events() override
{
g_signal_handler_block(m_pCheckButton, m_nSignalId);
- GtkInstanceButton::disable_notify_events();
+ GtkInstanceWidget::disable_notify_events();
}
virtual void enable_notify_events() override
{
- GtkInstanceButton::enable_notify_events();
+ GtkInstanceWidget::enable_notify_events();
g_signal_handler_unblock(m_pCheckButton, m_nSignalId);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
